move charts.d and node.d configuration files /etc/netdata/charts.d and /etc/netdata/node.d
Costa Tsaousis (ktsaou) committed
Jul 14, 2016 at 22:17 UTC
e95a54e3835e81ca9c859859af170bd7c7cb53d7
2 files changed
+50
-5
netdata-installer.sh
+43
-2
@@ -1,4 +1,4 @@
1
-#!/bin/bash
1
+#!/usr/bin/env bash
2
3
# reload the user profile
4
[ -f /etc/profile ] && . /etc/profile
@@ -388,6 +388,47 @@ if [ -f "configs.signatures" ]
388
source "configs.signatures" || echo >&2 "ERROR: Failed to load configs.signatures !"
389
fi
390
391
+# migrate existing configuration files
392
+# for node.d and charts.d
393
+if [ -d "${NETDATA_PREFIX}/etc/netdata" ]
394
+ then
395
+ # the configuration directory exists
396
+
397
+ if [ ! -d "${NETDATA_PREFIX}/etc/netdata/charts.d" ]
398
+ then
399
+ run mkdir "${NETDATA_PREFIX}/etc/netdata/charts.d"
400
+ fi
401
+
402
+ # move the charts.d config files
403
+ for x in apache ap cpu_apps cpufreq example exim hddtemp load_average mem_apps mysql nginx nut opensips phpfpm postfix sensors squid tomcat
404
+ do
405
+ for y in "" ".old" ".orig"
406
+ do
407
+ if [ -f "${NETDATA_PREFIX}/etc/netdata/${x}.conf${y}" ]
408
+ then
409
+ run mv -f "${NETDATA_PREFIX}/etc/netdata/${x}.conf${y}" "${NETDATA_PREFIX}/etc/netdata/charts.d/${x}.conf${y}"
410
+ fi
411
+ done
412
+ done
413
+
414
+ if [ ! -d "${NETDATA_PREFIX}/etc/netdata/node.d" ]
415
+ then
416
+ run mkdir "${NETDATA_PREFIX}/etc/netdata/node.d"
417
+ fi
418
+
419
+ # move the node.d config files
420
+ for x in named sma_webbox snmp
421
+ do
422
+ for y in "" ".old" ".orig"
423
+ do
424
+ if [ -f "${NETDATA_PREFIX}/etc/netdata/${x}.conf${y}" ]
425
+ then
426
+ run mv -f "${NETDATA_PREFIX}/etc/netdata/${x}.conf${y}" "${NETDATA_PREFIX}/etc/netdata/node.d/${x}.conf${y}"
427
+ fi
428
+ done
429
+ done
430
+fi
431
+
432
# backup user configurations
433
installer_backup_suffix="${PID}.${RANDOM}"
434
for x in $(find "${NETDATA_PREFIX}/etc/netdata/" -name '*.conf' -type f)
@@ -543,7 +584,7 @@ fi
584
585
echo >&2
586
echo >&2 "Fixing directories (user: ${NETDATA_USER})..."
546
-for x in "${NETDATA_WEB_DIR}" "${NETDATA_CONF_DIR}" "${NETDATA_CACHE_DIR}" "${NETDATA_LOG_DIR}" "${NETDATA_LIB_DIR}"
587
+for x in "${NETDATA_WEB_DIR}" "${NETDATA_CONF_DIR}" "${NETDATA_CACHE_DIR}" "${NETDATA_LOG_DIR}" "${NETDATA_LIB_DIR}" "${NETDATA_CONF_DIR}/python.d" "${NETDATA_CONF_DIR}/charts.d" "${NETDATA_CONF_DIR}/node.d"
588
do
589
if [ ! -d "${x}" ]
590
then
plugins.d/charts.d.plugin
+7
-3
@@ -1,4 +1,4 @@
1
-#!/bin/bash
1
+#!/usr/bin/env bash
2
3
PROGRAM_FILE="$0"
4
PROGRAM_NAME="$(basename $0)"
@@ -411,12 +411,16 @@ do
411
[ $debug -eq 1 ] && echo >&2 "$PROGRAM_NAME: loading chart: '$chartsd/$chart.chart.sh'"
412
. "$chartsd/$chart.chart.sh"
413
414
- if [ -f "$confd/$chart.conf" ]
414
+ if [ -f "$confd/charts.d/$chart.conf" ]
415
+ then
416
+ [ $debug -eq 1 ] && echo >&2 "$PROGRAM_NAME: loading chart options: '$confd/charts.d/$chart.conf'"
417
+ . "$confd/charts.d/$chart.conf"
418
+ elif [ -f "$confd/$chart.conf" ]
419
then
420
[ $debug -eq 1 ] && echo >&2 "$PROGRAM_NAME: loading chart options: '$confd/$chart.conf'"
421
. "$confd/$chart.conf"
422
else
419
- echo >&2 "$PROGRAM_NAME: $chart: configuration file '$confd/$chart.conf' not found. Using defaults."
423
+ echo >&2 "$PROGRAM_NAME: $chart: configuration file '$confd/charts.d/$chart.conf' not found. Using defaults."
424
fi
425
426
eval "dt=\$$chart$suffix_update_every"