Merge pull request ganglia#200 from chuntera/master

jbuchbinder · jbuchbinder · commit 3198aafef15c · 2015-06-22T11:58:37.000-04:00
add lustre gmond python module
diff --git a/lustre/README.md b/lustre/README.md
@@ -0,0 +1,17 @@
+Lustre Client Ganglia Metrics
+
+These python scripts collect lustre filesystem metric for ganglia-gmond module.
+
+The scripts attempt to collect separate metrics for each lustre
+filesystem mounted on the client. In addition to typical read/write bandwidth
+metrics, the scripts also attempt to collect inode-related metrics (network RPC calls from the client to the object storage servers).
+
+Lustre client exposes metrics through linux sysfs
+(ie. /proc/fs/lustre/...).  
+
+The "llite" metrics are high-level aggergate metrics of the underlying
+storage targets. On older versions of lustre, there are known bugs in
+the llite values. The "osc" metrics are lower level, offering values
+for each storage target (ie. LUN) that is accessed by the client. Note
+that lustre client uses local (client-side) file caching which can
+affect these values.
diff --git a/lustre/conf.d/lusclt_llite.pyconf b/lustre/conf.d/lusclt_llite.pyconf
@@ -0,0 +1,27 @@
+modules {
+  module {
+    name = "lusclt_llite"
+    language = "python"
+  }
+}
+
+collection_group {
+  collect_every = 60
+  time_threshold = 600
+
+  metric {
+    name_match = "lusclt_([a-zA-Z0-9]+)_write_bytes_per_sec"
+  }
+
+  metric {
+    name_match = "lusclt_([a-zA-Z0-9]+)_brw_read_bytes_per_sec"
+  }
+
+  metric {
+    name_match = "lusclt_([a-zA-Z0-9]+)_file_ops"
+  }
+
+  metric {
+    name_match = "lusclt_([a-zA-Z0-9]+)_inode_ops"
+  }
+}
diff --git a/lustre/conf.d/lusclt_osc.pyconf b/lustre/conf.d/lusclt_osc.pyconf
@@ -0,0 +1,19 @@
+modules {
+  module {
+    name = "lusclt_osc"
+    language = "python"
+  }
+}
+
+collection_group {
+  collect_every = 60
+  time_threshold = 600
+
+  metric {
+    name_match = "lusclt_osc_total_([a-zA-Z0-9]+)"
+  }
+
+  metric {
+    name_match = "lusclt_([a-zA-Z0-9]+)_total_([a-zA-Z0-9]+)"
+  }
+}
diff --git a/lustre/graph.d/lusclt_rpc_report.json b/lustre/graph.d/lusclt_rpc_report.json
@@ -0,0 +1,9 @@
+{
+   "report_name" : "lusclt_rpc_report",
+   "report_type" : "standard",
+   "title" : "Lustre Client RPC",
+   "vertical_label" : "calls/s",
+   "series" : [
+      { "metric": "lusclt_osc_total_ost_ops", "color": "FF0000", "label": "Home", "line_width": "2","type": "stack" }
+   ]
+}
diff --git a/lustre/graph.d/lusclt_rw_report.json b/lustre/graph.d/lusclt_rw_report.json
@@ -0,0 +1,10 @@
+{
+   "report_name" : "lusclt_rm_report",
+   "report_type" : "standard",
+   "title" : "Lustre Client Bandwidth",
+   "vertical_label" : "bytes/s",
+   "series" : [
+      { "metric": "lusclt_osc_total_read_bytes_per_sec", "color": "FF8A60", "label": "Read", "line_width": "2","type": "stack" },
+      { "metric": "lusclt_osc_total_write_bytes_per_sec", "color": "FF0000", "label": "Write", "line_width": "2","type": "stack" }
+   ]
+}
diff --git a/lustre/python_modules/lusclt_llite.py b/lustre/python_modules/lusclt_llite.py
diff --git a/lustre/python_modules/lusclt_osc.py b/lustre/python_modules/lusclt_osc.py
