diff --git a/collectd/README.md b/collectd/README.md index 2971687..773c206 100644 --- a/collectd/README.md +++ b/collectd/README.md @@ -9,7 +9,7 @@ in RRD files. ``` ~/fig/collectd/ -├── collectd/ +├── data/ │   ├── collectd.conf │   └── conf.d/ │   └── network.conf @@ -20,7 +20,7 @@ in RRD files. collectd.conf -``` +```apache Hostname "localhost" FQDNLookup false @@ -39,7 +39,7 @@ Include "/etc/collectd/conf.d/*.conf" network.conf -``` +```apache LoadPlugin network @@ -47,13 +47,40 @@ LoadPlugin network ``` +weather.conf + +```apache +LoadPlugin curl_json + + + + Instance "Beijing" + + Type "gauge" + + + + Instance "Shanghai" + + Type "gauge" + + + + Instance "Silicon_Valley" + + Type "gauge" + + + +``` + ## docker-compose.yml ``` collectd: image: vimagick/collectd volumes: - - ./collectd:/etc/collectd + - ./data:/etc/collectd pid: host net: host restart: always diff --git a/collectd/collectd/collectd.conf b/collectd/data/collectd.conf similarity index 100% rename from collectd/collectd/collectd.conf rename to collectd/data/collectd.conf diff --git a/collectd/collectd/conf.d/filters.conf b/collectd/data/conf.d/filters.conf similarity index 100% rename from collectd/collectd/conf.d/filters.conf rename to collectd/data/conf.d/filters.conf diff --git a/collectd/collectd/conf.d/graphite.conf b/collectd/data/conf.d/graphite.conf similarity index 100% rename from collectd/collectd/conf.d/graphite.conf rename to collectd/data/conf.d/graphite.conf diff --git a/collectd/collectd/conf.d/network.conf b/collectd/data/conf.d/network.conf similarity index 100% rename from collectd/collectd/conf.d/network.conf rename to collectd/data/conf.d/network.conf diff --git a/collectd/collectd/conf.d/ping.conf b/collectd/data/conf.d/ping.conf similarity index 100% rename from collectd/collectd/conf.d/ping.conf rename to collectd/data/conf.d/ping.conf diff --git a/collectd/collectd/conf.d/thresholds.conf b/collectd/data/conf.d/thresholds.conf similarity index 100% rename from collectd/collectd/conf.d/thresholds.conf rename to collectd/data/conf.d/thresholds.conf diff --git a/collectd/data/conf.d/weather.conf b/collectd/data/conf.d/weather.conf new file mode 100644 index 0000000..7475f5a --- /dev/null +++ b/collectd/data/conf.d/weather.conf @@ -0,0 +1,22 @@ +LoadPlugin curl_json + + + + Instance "Beijing" + + Type "gauge" + + + + Instance "Shanghai" + + Type "gauge" + + + + Instance "Silicon_Valley" + + Type "gauge" + + + diff --git a/collectd/docker-compose.yml b/collectd/docker-compose.yml index 2aa443e..67e1d04 100644 --- a/collectd/docker-compose.yml +++ b/collectd/docker-compose.yml @@ -1,7 +1,7 @@ collectd: image: vimagick/collectd volumes: - - ./collectd:/etc/collectd + - ./data:/etc/collectd pid: host net: host restart: always