diff options
author | Costa Tsaousis <costa@tsaousis.gr> | 2018-09-27 20:37:52 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-27 20:37:52 +0300 |
commit | 73608f86b4c10f72fff991fbf9bfa1a802c2d95c (patch) | |
tree | 56001d6001f5e388ff2eea8cd41a35f9e7d1b598 /conf.d | |
parent | a440a24688f2258bba3ac2e7bbd57c112581893d (diff) |
stock configs in /usr/lib/netdata (#4283)
* makefiles install configs in /usr/lib/netdata/conf.d; #4182
* stock health config in /usr/lib/netdata/conf.d/health.d
* unit test path concatenation
* simplified health file management
* use stream.conf from stock config if it does not exist in /etc/netdata
* indicate loading of user config in function call
* load netdata.conf from stock dir if not found in /etc/netdata
* added NETDATA_USER_CONFIG_DIR
* provide defaults before loading config
* charts.d uses stock files
* fping now uses the stock config files
* tc-qos-helper.sh now uses stock configs
* cgroup-name.sh now uses stock configs too
* simplified cgroup-name.sh for user and stock config
* alarm-notify.sh uses stock configs too
* simplified fping plugin configs loading
* simplified tc-qos-helper.sh configs loading
* added error handling to charts.d.plugin
* apps.plugin used stock configs
* generalized recursive double-directory configs loading
* statsd uses stock configs
* node.d.plugin uses stock configs
* compile-time decision of netdata default paths for all files
* makeself cleans up old stock config files from user configuration directories
* fixed makeself typo
* netdata-installer.sh removes stock files from user configuration directories
* python.d.plugin user/stock configs update
* cleanup stock config files from /etc/netdata, only once
* python.d.plugin log loaded files
* fix permissions of stock config files and provide an "orig" link for quick access
* create help link on stock configs migration for static installations
* create user config directories
* example statsd synthetic charts now state they are examples
* updated configs.signatures
* spec file
* fixes in spec file
* fix typo
* install netdata after cleaning up stock configs from /etc/netdata
* python.d: add cpuidle stock conf
Diffstat (limited to 'conf.d')
-rw-r--r-- | conf.d/Makefile.am | 14 | ||||
-rw-r--r-- | conf.d/python.d/cpuidle.conf | 40 | ||||
-rw-r--r-- | conf.d/statsd.d/example.conf | 18 |
3 files changed, 56 insertions, 16 deletions
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am index cc60ff1dd9..817d366d27 100644 --- a/conf.d/Makefile.am +++ b/conf.d/Makefile.am @@ -4,7 +4,7 @@ # MAINTAINERCLEANFILES= $(srcdir)/Makefile.in -dist_config_DATA = \ +dist_libconfig_DATA = \ apps_groups.conf \ charts.d.conf \ fping.conf \ @@ -15,7 +15,7 @@ dist_config_DATA = \ stream.conf \ $(NULL) -nodeconfigdir=$(configdir)/node.d +nodeconfigdir=$(libconfigdir)/node.d dist_nodeconfig_DATA = \ node.d/README.md \ node.d/fronius.conf.md \ @@ -25,7 +25,7 @@ dist_nodeconfig_DATA = \ node.d/stiebeleltron.conf.md \ $(NULL) -pythonconfigdir=$(configdir)/python.d +pythonconfigdir=$(libconfigdir)/python.d dist_pythonconfig_DATA = \ python.d/apache.conf \ python.d/beanstalk.conf \ @@ -34,6 +34,7 @@ dist_pythonconfig_DATA = \ python.d/ceph.conf \ python.d/chrony.conf \ python.d/couchdb.conf \ + python.d/cpuidle.conf \ python.d/cpufreq.conf \ python.d/dns_query_time.conf \ python.d/dnsdist.conf \ @@ -88,8 +89,7 @@ dist_pythonconfig_DATA = \ python.d/web_log.conf \ $(NULL) -healthconfigdir=$(configdir)/health.d - +healthconfigdir=$(libconfigdir)/health.d dist_healthconfig_DATA = \ health.d/apache.conf \ health.d/apcupsd.conf \ @@ -148,7 +148,7 @@ dist_healthconfig_DATA = \ health.d/zfs.conf \ $(NULL) -chartsconfigdir=$(configdir)/charts.d +chartsconfigdir=$(libconfigdir)/charts.d dist_chartsconfig_DATA = \ charts.d/apache.conf \ charts.d/apcupsd.conf \ @@ -172,7 +172,7 @@ dist_chartsconfig_DATA = \ charts.d/squid.conf \ $(NULL) -statsdconfigdir=$(configdir)/statsd.d +statsdconfigdir=$(libconfigdir)/statsd.d dist_statsdconfig_DATA = \ statsd.d/example.conf \ $(NULL) diff --git a/conf.d/python.d/cpuidle.conf b/conf.d/python.d/cpuidle.conf new file mode 100644 index 0000000000..bc276fcd2a --- /dev/null +++ b/conf.d/python.d/cpuidle.conf @@ -0,0 +1,40 @@ +# netdata python.d.plugin configuration for cpuidle +# +# This file is in YaML format. Generally the format is: +# +# name: value +# +# There are 2 sections: +# - global variables +# - one or more JOBS +# +# JOBS allow you to collect values from multiple sources. +# Each source will have its own set of charts. +# +# JOB parameters have to be indented (using spaces only, example below). + +# ---------------------------------------------------------------------- +# Global Variables +# These variables set the defaults for all JOBs, however each JOB +# may define its own, overriding the defaults. + +# update_every sets the default data collection frequency. +# If unset, the python.d.plugin default is used. +# update_every: 1 + +# priority controls the order of charts at the netdata dashboard. +# Lower numbers move the charts towards the top of the page. +# If unset, the default for python.d.plugin is used. +# priority: 60000 + +# retries sets the number of retries to be made in case of failures. +# If unset, the default for python.d.plugin is used. +# Attempts to restore the service are made once every update_every +# and only if the module has collected values in the past. +# retries: 60 + +# autodetection_retry sets the job re-check interval in seconds. +# The job is not deleted if check fails. +# Attempts to start the job are made once every autodetection_retry. +# This feature is disabled by default. +# autodetection_retry: 0 diff --git a/conf.d/statsd.d/example.conf b/conf.d/statsd.d/example.conf index 0af9dd27dd..f7c12b4ab3 100644 --- a/conf.d/statsd.d/example.conf +++ b/conf.d/statsd.d/example.conf @@ -7,10 +7,10 @@ # give a name for this app # this controls the main menu on the dashboard # and will be the prefix for all charts of the app - name = myapp + name = myexampleapp # match all the metrics of the app - metrics = myapp.* + metrics = myexampleapp.* # shall private charts of these metrics be created? private charts = no @@ -29,10 +29,10 @@ # create a chart -# this is its id - the chart will be named myapp.mychart -[mychart] +# this is its id - the chart will be named myexampleapp.myexamplechart +[myexamplechart] # a name for the chart, similar to the id (2 names for each chart) - name = mychart + name = myexamplechart # the chart title title = my chart title @@ -57,9 +57,9 @@ # events = the number of events for this metric # last = the last value collected # all the others are only valid for histograms and timers - dimension = myapp.metric1 avg average 1 1 - dimension = myapp.metric1 lower min 1 1 - dimension = myapp.metric1 upper max 1 1 - dimension = myapp.metric2 other last 1 1 + dimension = myexampleapp.metric1 avg average 1 1 + dimension = myexampleapp.metric1 lower min 1 1 + dimension = myexampleapp.metric1 upper max 1 1 + dimension = myexampleapp.metric2 other last 1 1 # You can add as many charts as needed |