Merge pull request #15 from codefresh-io/CR-2294

Fix node_exporter.sh

Author: palson-cf

monitor/node_exporter.sh

@@ -8,17 +8,13 @@ echo "Starting node_exporter at $(date):
    TEXTFILE_DIRECTORY = ${TEXTFILE_DIRECTORY}
 "
 
-DISABLED_COLLECTORS=(arp bcache bonding buddyinfo conntrack cpu diskstats drbd edac entropy filefd filesystem gmond hwmon infiniband \
-        interrupts ipvs ksmd loadavg logind mdadm megacli meminfo meminfo_numa mountstats netdev netstat nfs ntp qdisc \
-        runit sockstat stat supervisord systemd tcpstat time uname vmstat wifi xfs zfs timex )
+ENABLED_COLLECTORS=${ENABLED_COLLECTORS//,/ }
+ENABLED_COLLECTORS_ARRAY=($ENABLED_COLLECTORS)
 
-DISABLE_COLLECTORS_ARGS=""
-for i in ${DISABLED_COLLECTORS[@]}; do
-   if [[ -n "${ENABLED_COLLECTORS}" && "${i}" =~ ${ENABLED_COLLECTORS} ]]; then
-      echo "node_exporter - Enabling collector $i "
-      continue
-   fi
-   DISABLE_COLLECTORS_ARGS="${DISABLE_COLLECTORS_ARGS} --no-collector.${i}"
+ENABLE_COLLECTORS_ARGS=""
+for i in ${ENABLED_COLLECTORS_ARRAY[@]}; do
+   echo "node_exporter - Enabling collector $i "
+   ENABLE_COLLECTORS_ARGS="${ENABLE_COLLECTORS_ARGS} --collector.${i}"
 done
 
-node_exporter ${DISABLE_COLLECTORS_ARGS} --collector.textfile --collector.textfile.directory=${TEXTFILE_DIRECTORY}
+node_exporter --collector.disable-defaults ${ENABLE_COLLECTORS_ARGS} --collector.textfile --collector.textfile.directory=${TEXTFILE_DIRECTORY}

service.yaml

@@ -1 +1 @@
-version: 1.24.4
+version: 1.24.5