summaryrefslogtreecommitdiffstats
path: root/collectors/charts.d.plugin
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-05-19 12:33:38 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-05-19 12:33:59 +0000
commit1ee0c09c5742557e037df5421ca62abddb90ae22 (patch)
tree71c0fa48bb6d31d036c9badd7e038527f90d1a73 /collectors/charts.d.plugin
parentReleasing debian version 1.30.1-1. (diff)
downloadnetdata-1ee0c09c5742557e037df5421ca62abddb90ae22.tar.xz
netdata-1ee0c09c5742557e037df5421ca62abddb90ae22.zip
Merging upstream version 1.31.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'collectors/charts.d.plugin')
-rw-r--r--collectors/charts.d.plugin/charts.d.conf2
-rwxr-xr-xcollectors/charts.d.plugin/charts.d.plugin.in10
-rw-r--r--collectors/charts.d.plugin/opensips/opensips.chart.sh1
3 files changed, 7 insertions, 6 deletions
diff --git a/collectors/charts.d.plugin/charts.d.conf b/collectors/charts.d.plugin/charts.d.conf
index d6add5e5b..0872d39e6 100644
--- a/collectors/charts.d.plugin/charts.d.conf
+++ b/collectors/charts.d.plugin/charts.d.conf
@@ -1,6 +1,6 @@
# This is the configuration for charts.d.plugin
-# Each of its collectors can read configuration eiher from this file
+# Each of its collectors can read configuration either from this file
# or a NAME.conf file (where NAME is the collector name).
# The collector specific file has higher precedence.
diff --git a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in
index 62363f3db..1b5c3f337 100755
--- a/collectors/charts.d.plugin/charts.d.plugin.in
+++ b/collectors/charts.d.plugin/charts.d.plugin.in
@@ -130,7 +130,7 @@ update_every=${minimum_update_frequency} # this will be overwritten by the comma
charts_create="_create"
charts_update="_update"
charts_check="_check"
-charts_undescore="_"
+charts_underscore="_"
# when making iterations, charts.d can loop more frequently
# to prevent plugins missing iterations.
@@ -345,7 +345,7 @@ float2int() {
[ -z "${a}" ] && a="0"
# strip leading zeros from the integer part
- # base 10 convertion
+ # base 10 conversion
a=$((10#$a))
# check the length of the decimal part
@@ -361,7 +361,7 @@ float2int() {
fi
# strip leading zeros from the decimal part
- # base 10 convertion
+ # base 10 conversion
b=$((10#$b))
# store the result
@@ -467,9 +467,9 @@ all_enabled_charts() {
# check its config
#if [ -f "$userconfd/$chart.conf" ]
#then
- # if [ ! -z "$( cat "$userconfd/$chart.conf" | sed "s/^ \+//g" | grep -v "^$" | grep -v "^#" | grep -v "^$chart$charts_undescore" )" ]
+ # if [ ! -z "$( cat "$userconfd/$chart.conf" | sed "s/^ \+//g" | grep -v "^$" | grep -v "^#" | grep -v "^$chart$charts_underscore" )" ]
# then
- # error "module's $chart config $userconfd/$chart.conf should only have lines starting with $chart$charts_undescore . Disabling it."
+ # error "module's $chart config $userconfd/$chart.conf should only have lines starting with $chart$charts_underscore . Disabling it."
# continue
# fi
#fi
diff --git a/collectors/charts.d.plugin/opensips/opensips.chart.sh b/collectors/charts.d.plugin/opensips/opensips.chart.sh
index 447dd0bc0..d3a2118ce 100644
--- a/collectors/charts.d.plugin/opensips/opensips.chart.sh
+++ b/collectors/charts.d.plugin/opensips/opensips.chart.sh
@@ -31,6 +31,7 @@ opensips_check() {
# try to find it in the system
if [ -z "$opensips_cmd" ]; then
require_cmd opensipsctl || return 1
+ opensips_cmd="$OPENSIPSCTL_CMD"
fi
# check once if the command works