fix spdx (#4327)

CMakeLists.txt

@@ -1,5 +1,5 @@
 
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # This file is only used for development (netdata in Clion)
 # It can build netdata, but you are on your own...
 

CONTRIBUTORS.md

@@ -1,5 +1,5 @@
 <!--
-SPDX-License-Identifier: GPL-3.0+
+SPDX-License-Identifier: GPL-3.0-or-later
 -->
 
 # netdata contributors license agreement

Makefile.am

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 AUTOMAKE_OPTIONS=foreign 1.10
 ACLOCAL_AMFLAGS = -I build/m4

build/m4/ax_pthread.m4

@@ -56,7 +56,7 @@
 #   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
 #   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
 #
-#   SPDX-License-Identifier: GPL-3.0+
+#   SPDX-License-Identifier: GPL-3.0-or-later
 
 #serial 21
 

charts.d/Makefile.am

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
 

charts.d/ap.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/apache.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/apcupsd.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/cpu_apps.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash disable=SC2154,SC1072,SC1073,SC2009,SC2162,SC2006,SC2002,SC2086,SC1117
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/cpufreq.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/example.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/exim.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/hddtemp.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/libreswan.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash disable=SC1117
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/load_average.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash disable=SC2154,SC1072,SC1073,SC2009,SC2162,SC2006,SC2002,SC2086,SC1117
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/mem_apps.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash disable=SC2154,SC1072,SC1073,SC2009,SC2162,SC2006,SC2002,SC2086,SC1117
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/mysql.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/nginx.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/nut.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/opensips.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash disable=SC1117,SC2154,SC2086
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/phpfpm.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/postfix.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash disable=SC1117
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/sensors.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/squid.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash disable=SC2154
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

charts.d/tomcat.chart.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 # no need for shebang - this file is loaded from charts.d.plugin
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

conf.d/Makefile.am

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
 

configure.ac

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 AC_PREREQ(2.60)
 

contrib/Makefile.am

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
 
 dist_noinst_DATA = \

contrib/nc-backend.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 MODE="${1}"
 MY_PORT="${2}"

diagrams/Makefile.am

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
 
 dist_noinst_DATA = \

diagrams/build.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 path=$(dirname "$0")
 cd "${path}" || exit 1

docker/Dockerfile

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # author  : paulfantom
 
 # Cross-arch building is achieved by specifying ARCH as a build parameter with `--build-arg` option.

docker/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # Author  : Pawel Krupa (paulfantom)
 # Cross-arch docker build helper script
 

installer/functions.sh

@@ -1,5 +1,5 @@
 # no shebang necessary - this is a library to be sourced
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # shellcheck disable=SC1091,SC1117,SC2002,SC2004,SC2034,SC2046,SC2059,SC2086,SC2129,SC2148,SC2154,SC2155,SC2162,SC2166,SC2181,SC2193
 
 # make sure we have a UID

kickstart-static64.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # shellcheck disable=SC1117,SC2016,SC2034,SC2039,SC2059,SC2086,SC2119,SC2120,SC2129,SC2162,SC2166,SC2181
 
 umask 022

kickstart.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 # Run me with:
 #

makeself/Makefile.am

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
 
 dist_noinst_DATA = \

makeself/build-x86_64-static.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . $(dirname "$0")/../installer/functions.sh || exit 1
 

makeself/build.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # -----------------------------------------------------------------------------
 # parse command line arguments

makeself/functions.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # -----------------------------------------------------------------------------
 

makeself/install-alpine-packages.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # this script should be running in alpine linux
 # install the required packages

makeself/install-or-update.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . $(dirname "${0}")/functions.sh
 

makeself/jobs/10-prepare-destination.install.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . $(dirname "${0}")/../functions.sh "${@}" || exit 1
 

makeself/jobs/50-bash-4.4.18.install.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . $(dirname "${0}")/../functions.sh "${@}" || exit 1
 

makeself/jobs/50-curl-7.60.0.install.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . $(dirname "${0}")/../functions.sh "${@}" || exit 1
 

makeself/jobs/50-fping-4.0.install.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . $(dirname "${0}")/../functions.sh "${@}" || exit 1
 

makeself/jobs/70-netdata-git.install.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . ${NETDATA_MAKESELF_PATH}/functions.sh "${@}" || exit 1
 

makeself/jobs/99-makeself.install.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 . $(dirname "${0}")/../functions.sh "${@}" || exit 1
 

makeself/makeself-header.sh

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 cat << EOF  > "$archname"
 #!/bin/sh
 # This script was generated using Makeself $MS_VERSION

makeself/makeself.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 # Makeself version 2.3.x
 #  by Stephane Peter <megastep@megastep.org>

makeself/post-installer.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # This script is started using the shell of the system
 # and executes our 'install-or-update.sh' script

makeself/run-all-jobs.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 LC_ALL=C
 umask 002

netdata-installer.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 # shellcheck disable=SC1090,SC1091,SC1117,SC2002,SC2034,SC2044,SC2046,SC2086,SC2129,SC2162,SC2166,SC2181
 
 export PATH="${PATH}:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"

netdata.spec.in

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 %global contentdir %{_datadir}/netdata
 
 # This is temporary and should eventually be resolved. This bypasses

node.d/Makefile.am

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
 
 dist_node_DATA = \

node.d/fronius.node.js

@@ -1,5 +1,5 @@
 "use strict";
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // This program will connect to one or more Fronius Symo Inverters.
 // to get the Solar Power Generated (current, today).

node.d/named.node.js

@@ -1,5 +1,5 @@
 'use strict';
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // collect statistics from bind (named) v9.10+
 //

node.d/node_modules/netdata.js

@@ -3,7 +3,7 @@
 // netdata
 // real-time performance and health monitoring, done right!
 // (C) 2016 Costa Tsaousis <costa@tsaousis.gr>
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 var url = require('url');
 var http = require('http');

node.d/sma_webbox.node.js

@@ -1,5 +1,5 @@
 'use strict';
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // This program will connect to one or more SMA Sunny Webboxes
 // to get the Solar Power Generated (current, today, total).

node.d/snmp.node.js

@@ -1,5 +1,5 @@
 'use strict';
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
 // netdata snmp module
 // This program will connect to one or more SNMP Agents
 //

node.d/stiebeleltron.node.js

@@ -1,5 +1,5 @@
 'use strict';
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // This program will connect to one Stiebel Eltron ISG for heatpump heating
 // to get the heat pump metrics.

packaging/check-files

@@ -1,5 +1,5 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #
 # check-files

packaging/git-build

@@ -1,5 +1,5 @@
 #!/bin/sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # When run from the top-level repository, performs a complete clean
 # and maintainer-mode rebuild of the FireHOL package.

packaging/packaging.functions

@@ -1,5 +1,5 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 packaging_check_init() {
   version_check=

packaging/release-msg

@@ -1,5 +1,5 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #
 # release-msg

packaging/tar-compare

@@ -1,5 +1,5 @@
 #!/bin/sh
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # When provided with a git repo, which has been used to produce a
 # distribution tar.gz (with make dist) and the resultant tar-file,

packaging/update-tags

@@ -1,5 +1,5 @@
 #!/bin/bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 #
 # update-tags

plugins.d/Makefile.am

@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
 CLEANFILES = \

plugins.d/alarm-email.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # OBSOLETE - REPLACED WITH
 # alarm-notify.sh

plugins.d/alarm-notify.sh.in

@@ -3,7 +3,7 @@
 # netdata
 # real-time performance and health monitoring, done right!
 # (C) 2017 Costa Tsaousis <costa@tsaousis.gr>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 # Script to send alarm notifications for netdata
 #

plugins.d/alarm-test.sh

@@ -3,7 +3,7 @@
 # netdata
 # real-time performance and health monitoring, done right!
 # (C) 2017 Costa Tsaousis <costa@tsaousis.gr>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 # Script to test alarm notifications for netdata
 

plugins.d/cgroup-name.sh.in

@@ -3,7 +3,7 @@
 # netdata
 # real-time performance and health monitoring, done right!
 # (C) 2016 Costa Tsaousis <costa@tsaousis.gr>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 # Script to find a better name for cgroups
 #

plugins.d/cgroup-network-helper.sh

@@ -5,7 +5,7 @@
 # detect container and virtual machine interfaces
 #
 # (C) 2017 Costa Tsaousis
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 # This script is called as root (by cgroup-network), with either a pid, or a cgroup path.
 # It tries to find all the network interfaces that belong to the same cgroup.

plugins.d/charts.d.dryrun-helper.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # shellcheck disable=SC2181
 

plugins.d/charts.d.plugin.in

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

plugins.d/fping.plugin.in

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # netdata
 # real-time performance and health monitoring, done right!

plugins.d/loopsleepms.sh.inc

@@ -1,5 +1,5 @@
 # no need for shebang - this file is included from other scripts
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 LOOPSLEEP_DATE="$(which date 2>/dev/null || command -v date 2>/dev/null)"
 if [ -z "$LOOPSLEEP_DATE" ]

plugins.d/node.d.plugin.in

@@ -11,7 +11,7 @@
 // netdata
 // real-time performance and health monitoring, done right!
 // (C) 2017 Costa Tsaousis <costa@tsaousis.gr>
-// SPDX-License-Identifier: GPL-3.0+
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 // --------------------------------------------------------------------------------------------------------------------
 

plugins.d/python.d.plugin.in

@@ -6,7 +6,7 @@ echo "ERROR python IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" # '''
 # Description:
 # Author: Pawel Krupa (paulfantom)
 # Author: Ilya Mashchenko (l2isbad)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import gc
 import os

plugins.d/tc-qos-helper.sh.in

@@ -3,7 +3,7 @@
 # netdata
 # real-time performance and health monitoring, done right!
 # (C) 2017 Costa Tsaousis <costa@tsaousis.gr>
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 # This script is a helper to allow netdata collect tc data.
 # tc output parsing has been implemented in C, inside netdata

python.d/Makefile.am

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
 CLEANFILES = \
     $(NULL)

python.d/apache.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: apache netdata python.d module
 # Author: Pawel Krupa (paulfantom)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from bases.FrameworkServices.UrlService import UrlService
 

python.d/beanstalk.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: beanstalk netdata python.d module
 # Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 try:
     import beanstalkc

python.d/bind_rndc.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: bind rndc netdata python.d module
 # Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 

python.d/boinc.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: BOINC netdata python.d module
 # Author: Austin S. Hemmelgarn (Ferroin)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import socket
 

python.d/ceph.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: ceph netdata python.d module
 # Author: Luis Eduardo (lets00)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 try:
     import rados

python.d/chrony.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: chrony netdata python.d module
 # Author: Dominik Schloesser (domschl)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from bases.FrameworkServices.ExecutableService import ExecutableService
 

python.d/couchdb.chart.py

@@ -2,7 +2,7 @@
 # Description: couchdb netdata python.d module
 # Author: wohali <wohali@apache.org>
 # Thanks to l2isbad for good examples :)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from collections import namedtuple, defaultdict
 from json import loads

python.d/cpufreq.chart.py

@@ -2,7 +2,7 @@
 # Description: cpufreq netdata python.d module
 # Author: Pawel Krupa (paulfantom)
 # Author: Steven Noonan (tycho)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import glob
 import os

python.d/cpuidle.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: cpuidle netdata python.d module
 # Author: Steven Noonan (tycho)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import ctypes
 import glob

python.d/dns_query_time.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: dns_query_time netdata python.d module
 # Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from random import choice
 from socket import getaddrinfo, gaierror

python.d/dnsdist.chart.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from json import loads
 

python.d/dovecot.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: dovecot netdata python.d module
 # Author: Pawel Krupa (paulfantom)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from bases.FrameworkServices.SocketService import SocketService
 

python.d/elasticsearch.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: elastic search node stats netdata python.d module
 # Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import json
 import threading

python.d/example.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: example netdata python.d module
 # Author: Put your name here (your github login)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from random import SystemRandom
 

python.d/exim.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: exim netdata python.d module
 # Author: Pawel Krupa (paulfantom)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from bases.FrameworkServices.ExecutableService import ExecutableService
 

python.d/fail2ban.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: fail2ban log netdata python.d module
 # Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import re
 import os

python.d/freeradius.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: freeradius netdata python.d module
 # Author: l2isbad
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from re import findall
 from subprocess import Popen, PIPE

python.d/go_expvar.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: go_expvar netdata python.d module
 # Author: Jan Kral (kralewitz)
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from __future__ import division
 import json

python.d/haproxy.chart.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Description: haproxy netdata python.d module
 # Author: l2isbad, ktarasz
-# SPDX-License-Identifier: GPL-3.0+
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 from collections import defaultdict
 from re import compile as re_compile