Ottomata has submitted this change and it was merged.

Change subject: Adding ganglia view for varnishkafka.
......................................................................


Adding ganglia view for varnishkafka.

Updating varnishkafka module to fix counter for rxbytes

Change-Id: Iaa0c31274f76602da5418a18b9852ca8773dd7e2
---
M manifests/misc/monitoring.pp
M modules/varnishkafka
2 files changed, 68 insertions(+), 0 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/misc/monitoring.pp b/manifests/misc/monitoring.pp
index 47d4cf8..a98b908 100644
--- a/manifests/misc/monitoring.pp
+++ b/manifests/misc/monitoring.pp
@@ -107,6 +107,7 @@
     misc::monitoring::view::kafka { 'kafka':
         kafka_broker_host_regex   => 'analytics102[12].*',
     }
+    class { 'misc::monitoring::view::varnishkafka': }
 
     class { 'misc::monitoring::view::navigation_timing': }
     class { 'misc::monitoring::view::static_assets': }
@@ -249,6 +250,73 @@
     }
 }
 
+# == Class misc::monitoring::view::varnishkafka
+#
+class misc::monitoring::view::varnishkafka($varnishkafka_host_regex = 'cp.+', 
$ensure = 'present') {
+    ganglia::view { $name:
+        ensure => $ensure,
+        graphs => [
+            # Queues:
+            # msgq -> xmit_msgq -> outbuf -> waitresp
+
+            # message queue count
+            {
+                'host_regex'   => $varnishkafka_host_regex,
+                'metric_regex' => 'kafka.rdkafka.topics..+.msgq_cnt',
+                'type'         => 'stack',
+            },
+            # transmit message queue count
+            {
+                'host_regex'   => $varnishkafka_host_regex,
+                'metric_regex' => 'kafka.rdkafka.topics..+.xmit_msgq_cnt',
+                'type'         => 'stack',
+            },
+            # output buffer queue count
+            {
+                'host_regex'   => $varnishkafka_host_regex,
+                'metric_regex' => 'kafka.rdkafka.topics..+.outbuf_cnt',
+                'type'         => 'stack',
+            },
+            # waiting for response buffer count
+            {
+                'host_regex'   => $varnishkafka_host_regex,
+                'metric_regex' => 'kafka.rdkafka.topics..+.waitresp_cnt',
+                'type'         => 'stack',
+            },
+
+            # transaction bytes
+            {
+                'host_regex'   => $varnishkafka_host_regex,
+                'metric_regex' => 'kafka.rdkafka.topics..+.txbytes',
+                'type'         => 'stack',
+            },
+
+            # transaction messages
+            {
+                'host_regex'   => $varnishkafka_host_regex,
+                'metric_regex' => 'kafka.rdkafka.topics..+.txmsgs',
+                'type'         => 'stack',
+            },
+
+            # round trip time average
+            {
+                'host_regex'   => $varnishkafka_host_regex,
+                'metric_regex' => 'kafka.rdkafka.brokers..+.rtt.avg',
+                'type'         => 'line',
+            },
+
+            # delivery report errors
+            {
+                'host_regex'   => $varnishkafka_host_regex,
+                'metric_regex' => 'kafka.varnishkafka.kafka_drerr',
+                'type'         => 'stack',
+            },
+        ],
+    }
+}
+
+
+
 # == Class misc::monitoring::view::analytics::data
 # View for analytics data flow.
 # This is a class instead of a define because it is specific enough to never 
need
diff --git a/modules/varnishkafka b/modules/varnishkafka
index bb4b80c..a1a4324 160000
--- a/modules/varnishkafka
+++ b/modules/varnishkafka
-Subproject commit bb4b80c575d8a102a0de5f53533a5cecf8e5fbdc
+Subproject commit a1a43244cc6a6e3dfe1561c4443ad1149a6c9d67

-- 
To view, visit https://gerrit.wikimedia.org/r/100432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa0c31274f76602da5418a18b9852ca8773dd7e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to