diff options
| author | Ilya Mashchenko <ilya@netdata.cloud> | 2022-03-15 22:39:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-15 22:39:38 +0200 |
| commit | 0c9f02b539b9e8e88f447380477643e79e725166 (patch) | |
| tree | 48748893234d39dff4cd307829ef00d8589eb30f | |
| parent | 230fbe067d7287101443960077466cb9b7a086bc (diff) | |
fix(charts.d.plugin): fix recursion in apcupsd_check and enable it again (#12418)
| -rw-r--r-- | collectors/charts.d.plugin/apcupsd/apcupsd.chart.sh | 2 | ||||
| -rwxr-xr-x | collectors/charts.d.plugin/charts.d.plugin.in | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/collectors/charts.d.plugin/apcupsd/apcupsd.chart.sh b/collectors/charts.d.plugin/apcupsd/apcupsd.chart.sh index e78d99e7d4..b4edc0caf7 100644 --- a/collectors/charts.d.plugin/apcupsd/apcupsd.chart.sh +++ b/collectors/charts.d.plugin/apcupsd/apcupsd.chart.sh @@ -50,7 +50,7 @@ apcupsd_check() { local host working=0 failed=0 for host in "${!apcupsd_sources[@]}"; do - run apcupsd_get "${apcupsd_sources[${host}]}" > /dev/null + apcupsd_get "${apcupsd_sources[${host}]}" > /dev/null # shellcheck disable=2181 if [ $? -ne 0 ]; then error "cannot get information for apcupsd server ${host} on ${apcupsd_sources[${host}]}." diff --git a/collectors/charts.d.plugin/charts.d.plugin.in b/collectors/charts.d.plugin/charts.d.plugin.in index ef31330f61..9187fc25d2 100755 --- a/collectors/charts.d.plugin/charts.d.plugin.in +++ b/collectors/charts.d.plugin/charts.d.plugin.in @@ -418,11 +418,6 @@ all_enabled_charts() { # find all enabled charts for chart in $(all_charts); do MODULE_NAME="${chart}" - - if [ "$MODULE_NAME" == "apcupsd" ] && [ -n "$NETDATA_LISTENER_PORT" ]; then - info "apcupsd is temporarily disabled because of bug #12413" - continue - fi if [ -n "${obsolete_charts["$MODULE_NAME"]}" ]; then debug "is replaced by ${obsolete_charts["$MODULE_NAME"]}, skipping it." |