Merge pull request #19 from y4ns0l0/master

Add capacity and quota metrics

README.md

@@ -19,15 +19,21 @@ A set of collectd plugins monitoring and publishing metrics for Ceph components.
 
 ## Screenshots
 
-Sample Grafana dashboard displaying common metrics from the plugins.
+Sample __Ceph Overview__ dashboard displaying common metrics from the plugins.
 
 ![image](public/ceph-overview.png)
 
 ![image](public/ceph-overview1.png)
 
 ![image](public/ceph-overview2.png)
 
-[Check here](grafana/ceph-overview.json) for the dashboard definition.
+Sample __Ceph Pool Capacity__ dashboard, if you are using pool quota this sample may be usefull.
+
+![image](public/ceph-pool-capacity.png)
+
+[Check here](grafana/ceph-overview.json) for the __Ceph Overview__ dashboard definition.
+
+[Check here](grafana/ceph-pool-capacity.json) for the __Ceph Pool Capacity__ dashboard definition.
 
 ## Plugins and Metrics
 
@@ -44,12 +50,22 @@ Find below a list of the available plugins and the metrics they publish.
  * ceph-<cluster>.osd.gauge.in (number of osds 'in')
  * ceph-<cluster>.osd.gauge.out (number of osds 'out')
 * ceph_pool_plugin
+ * ceph-<cluster>.pool-<name>.gauge.size (per pool size)
+ * ceph-<cluster>.pool-<name>.gauge.min_size (per pool min_size)
+ * ceph-<cluster>.pool-<name>.gauge.pg_num (per pool pg_num)
+ * ceph-<cluster>.pool-<name>.gauge.pgp_num (per pool pg_placement_num)
+ * ceph-<cluster>.pool-<name>.gauge.quota_max_bytes (per pool quota_max_bytes)
+ * ceph-<cluster>.pool-<name>.gauge.quota_max_objects (per pool quota_max_objects)
+ * ceph-<cluster>.pool-<name>.gauge.max_avail (per pool max_available)
+ * ceph-<cluster>.pool-<name>.gauge.objects (per pool objects number)
+ * ceph-<cluster>.pool-<name>.gauge.objects (per pool objects number)
  * ceph-<cluster>.pool-<name>.gauge.read_bytes_sec (per pool read bytes/sec)
  * ceph-<cluster>.pool-<name>.gauge.write_bytes_sec (per pool write bytes/sec)
  * ceph-<cluster>.pool-<name>.gauge.op_per_sec (per pool iops)
  * ceph-<cluster>.pool-<name>.gauge.bytes_used (per pool bytes used)
  * ceph-<cluster>.pool-<name>.gauge.kb_used (per pool KBytes used)
  * ceph-<cluster>.pool-<name>.gauge.objects (per pool number of objects)
+ min_size
  * ceph-<cluster>.cluster.gauge.total_avail (cluster space available)
  * ceph-<cluster>.cluster.gauge.total_space (cluster total raw space)
  * ceph-<cluster>.cluster.gauge.total_used (cluster raw space used)
@@ -139,13 +155,13 @@ GPLv2 (check LICENSE).
 
 ## Contributors
 
-Ricardo Rocha <rocha.porto@gmail.com> - original author
-Peter Gervai <grinapo/gmail> - merge maintainer
-Yann Matysiak (y4ns0l0)
-Pietari Hyvärinen (kallio)
-gcmalloc
-cfz
-tynorth-cisco
+* Ricardo Rocha <rocha.porto@gmail.com> - original author
+* [Peter Gervai (grinapo) - merge maintainer](https://github.com/grinapo)
+* [Yann Matysiak (y4ns0l0)](https://github.com/y4ns0l0)
+* [Pietari Hyvärinen (kallio)](https://github.com/kallio)
+* [gcmalloc](https://github.com/gcmalloc)
+* [cfz](https://github.com/cfz)
+* [tynorth-cisco](https://github.com/tynorth-cisco)
 
 ## Support
 

grafana/ceph-overview.json

@@ -753,8 +753,8 @@
  "Read iops": "#052B51",
  "Write datarate": "#E0752D",
  "Write iops": "#890F02",
- "datarate": "#C15C17",
- "iops": "#BF1B00",
+ "datarate": "#3F6833",
+ "iops": "#6ED0E0",
  "pool-cache_pool_00 datarate": "#3F6833",
  "pool-cache_pool_00 iops": "#7EB26D",
  "pool-data_pool_00 datarate": "#0A437C",
@@ -798,7 +798,7 @@
  "points": false,
  "renderer": "flot",
  "repeat": null,
- "repeatIteration": 1482227113843,
+ "repeatIteration": 1482412835383,
  "resolution": 100,
  "scale": 1,
  "scopedVars": {},
@@ -826,12 +826,12 @@
  "targets": [
  {
  "refId": "D",
- "target": "aliasSub(removeAbovePercentile(collectd.*.[[cluster]].$pool.gauge.write_op_per_sec, 99), '^.*(pool-.*)\\.gauge.*', '\\1 iops')",
+ "target": "alias(removeAbovePercentile(collectd.*.[[cluster]].$pool.gauge.write_op_per_sec, 99), 'iops')",
  "textEditor": false
  },
  {
  "refId": "A",
- "target": "aliasSub(removeAbovePercentile(collectd.*.[[cluster]].$pool.gauge.write_bytes_sec, 99), '^.*(pool-.*)\\.gauge.*', '\\1 datarate')",
+ "target": "alias(removeAbovePercentile(collectd.*.[[cluster]].$pool.gauge.write_bytes_sec, 99), 'datarate')",
  "textEditor": false
  }
  ],
@@ -867,8 +867,8 @@
  "Read iops": "#052B51",
  "Write datarate": "#E0752D",
  "Write iops": "#890F02",
- "datarate": "#C15C17",
- "iops": "#BF1B00",
+ "datarate": "#508642",
+ "iops": "#447EBC",
  "pool-cache_pool_00 datarate": "#3F6833",
  "pool-cache_pool_00 iops": "#7EB26D",
  "pool-data_pool_00 datarate": "#0A437C",
@@ -912,7 +912,7 @@
  "points": false,
  "renderer": "flot",
  "repeat": null,
- "repeatIteration": 1482227113843,
+ "repeatIteration": 1482412835383,
  "resolution": 100,
  "scale": 1,
  "scopedVars": {},
@@ -940,12 +940,12 @@
  "targets": [
  {
  "refId": "D",
- "target": "aliasSub(removeAbovePercentile(collectd.*.[[cluster]].[[pool]].gauge.read_op_per_sec, 99), '^.*(pool-.*)\\.gauge.*', '\\1 iops')",
+ "target": "alias(removeAbovePercentile(collectd.*.[[cluster]].[[pool]].gauge.read_op_per_sec, 99), 'iops')",
  "textEditor": false
  },
  {
  "refId": "A",
- "target": "aliasSub(removeAbovePercentile(collectd.*.[[cluster]].[[pool]].gauge.read_bytes_sec, 99), '^.*(pool-.*)\\.gauge.*', '\\1 datarate')",
+ "target": "alias(removeAbovePercentile(collectd.*.[[cluster]].[[pool]].gauge.read_bytes_sec, 99), 'datarate')",
  "textEditor": false
  }
  ],
@@ -979,8 +979,8 @@
  "repeat": "pool",
  "scopedVars": {
  "pool": {
- "text": "pool-data_pool_00",
- "value": "pool-data_pool_00",
+ "text": "pool-cinder-backup",
+ "value": "pool-cinder-backup",
  "selected": false
  }
  },
@@ -1364,7 +1364,7 @@
  },
  "refresh": "1m",
  "schemaVersion": 12,
- "version": 22,
+ "version": 26,
  "links": [],
  "gnetId": null
-}
+}