@cryptotaxi247 / netdata-1 / commits / 25c6fb7dc

modules that exist in python or inside netdata require to be forced

Costa Tsaousis (ktsaou) committed Jul 14, 2016 at 21:10 UTC 25c6fb7dc7876382ca370dc845e7eb14eff9a020
2 files changed +56 -14
conf.d/charts.d.conf
+32 -11
@@ -29,14 +29,35 @@
29 # -----------------------------------------------------------------------------
30
31 # the default enable/disable for all charts.d collectors
32 -#enable_all_charts="yes"
33 -
34 -# per charts.d collector enable/disable
35 -#nut=yes
36 -#squid=yes
37 -#postfix=yes
38 -#sensors=yes
39 -#cpufreq=yes
40 -#mysql=yes
41 -#example=yes
42 -#load_average=yes
32 +# the default is "yes"
33 +# enable_all_charts="yes"
34 +
35 +# BY DEFAULT ENABLED MODULES
36 +# ap=yes
37 +# nut=yes
38 +# opensips=yes
39 +
40 +# -----------------------------------------------------------------------------
41 +# THESE NEED TO BE SET TO "force" TO BE ENABLED
42 +
43 +# Nothing useful.
44 +# Just an example charts.d plugin you can use as a template.
45 +# example=force
46 +
47 +# OLD MODULES THAT ARE NOW SERVED BY python.d.plugin
48 +# apache=force
49 +# cpufreq=force
50 +# exim=force
51 +# hddtemp=force
52 +# mysql=force
53 +# nginx=force
54 +# phpfpm=force
55 +# postfix=force
56 +# sensors=force
57 +# squid=force
58 +# tomcat=force
59 +
60 +# OLD MODULES THAT ARE NOW SERVED BY NETDATA DAEMON
61 +# cpu_apps=force
62 +# mem_apps=force
63 +# load_average=force
plugins.d/charts.d.plugin
+24 -3
@@ -305,8 +305,26 @@ all_charts() {
305 ls *.chart.sh | sed "s/\.chart\.sh$//g"
306 }
307
308 +declare -A charts_enable_keyword=(
309 + ['apache']="force"
310 + ['cpu_apps']="force"
311 + ['cpufreq']="force"
312 + ['example']="force"
313 + ['exim']="force"
314 + ['hddtemp']="force"
315 + ['load_average']="force"
316 + ['mem_apps']="force"
317 + ['mysql']="force"
318 + ['nginx']="force"
319 + ['phpfpm']="force"
320 + ['postfix']="force"
321 + ['sensors']="force"
322 + ['squid']="force"
323 + ['tomcat']="force"
324 + )
325 +
326 all_enabled_charts() {
309 - local charts= enabled=
327 + local charts= enabled= required=
328
329 # find all enabled charts
330
@@ -318,9 +336,12 @@ all_enabled_charts() {
336 enabled="${enable_all_charts}"
337 fi
338
321 - if [ ! "${enabled}" = "yes" ]
339 + required="${charts_enable_keyword[${chart}]}"
340 + [ -z "${required}" ] && required="yes"
341 +
342 + if [ ! "${enabled}" = "${required}" ]
343 then
323 - echo >&2 "$PROGRAM_NAME: '$chart' is NOT enabled. Add a line with $chart=yes in $myconfig to enable it (or remove the line that disables it)."
344 + echo >&2 "$PROGRAM_NAME: '$chart' is NOT enabled. Add a line with $chart=$required in $myconfig to enable it (or remove the line that disables it)."
345 else
346 [ $debug -eq 1 ] && echo >&2 "$PROGRAM_NAME: '$chart' is enabled."
347 local charts="$charts $chart"