Module: check_mk
Branch: master
Commit: 8fbc0736bd09a0b14b4b6f201984647802825d63
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fbc0736bd09a0…
Author: Florian Kromer <fk(a)mathias-kettner.de>
Date: Thu Mar 14 09:40:52 2019 +0100
7050 FIX nginx_status: Add missing metric definitions
CMK-1766
Change-Id: I91685a58a4f9abdf7bb9d2f522a4f1ad22dabc29
---
.werks/7050 | 10 ++++
cmk/gui/plugins/metrics/check_mk.py | 66 ++++++++++++++++++++++
.../checks/generictests/datasets/nginx_status.py | 30 ++++++++++
3 files changed, 106 insertions(+)
diff --git a/.werks/7050 b/.werks/7050
new file mode 100644
index 0000000..f239c50
--- /dev/null
+++ b/.werks/7050
@@ -0,0 +1,10 @@
+Title: nginx_status: Add missing metric definitions
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.6.0i1
+Date: 1552552768
+Class: fix
+
+CMK-1766
diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py
index fc1755d..51d13b3 100644
--- a/cmk/gui/plugins/metrics/check_mk.py
+++ b/cmk/gui/plugins/metrics/check_mk.py
@@ -431,6 +431,72 @@ def register_hop_metrics():
register_hop_metrics()
+metric_info["accepted"] = {
+ "title": _("Accepted connections"),
+ "unit": "count",
+ "color": "11/a",
+}
+
+metric_info["accepted_per_sec"] = {
+ "title": _("Accepted connections per second"),
+ "unit": "1/s",
+ "color": "16/a",
+}
+
+metric_info["handled"] = {
+ "title": _("Handled connections"),
+ "unit": "count",
+ "color": "21/a",
+}
+
+metric_info["handled_per_sec"] = {
+ "title": _("Handled connections per second"),
+ "unit": "1/s",
+ "color": "26/a",
+}
+
+metric_info["requests"] = {
+ "title": _("Requests per second"),
+ "unit": "count",
+ "color": "31/a",
+}
+
+metric_info["requests_per_conn"] = {
+ "title": _("Requests per connection"),
+ "unit": "count",
+ "color": "33/a",
+}
+
+metric_info["requests_per_sec"] = {
+ "title": _("Requests per second"),
+ "unit": "1/s",
+ "color": "36/a",
+}
+
+metric_info["active"] = {
+ "title": _("Active connections"),
+ "unit": "count",
+ "color": "11/a",
+}
+
+metric_info["reading"] = {
+ "title": _("Reading connections"),
+ "unit": "count",
+ "color": "16/a",
+}
+
+metric_info["waiting"] = {
+ "title": _("Waiting connections"),
+ "unit": "count",
+ "color": "21/a",
+}
+
+metric_info["writing"] = {
+ "title": _("Writing connections"),
+ "unit": "count",
+ "color": "21/a",
+}
+
metric_info["rtt"] = {
"title": _("Round trip time"),
"unit": "s",
diff --git a/tests/unit/checks/generictests/datasets/nginx_status.py
b/tests/unit/checks/generictests/datasets/nginx_status.py
new file mode 100644
index 0000000..10bcda9
--- /dev/null
+++ b/tests/unit/checks/generictests/datasets/nginx_status.py
@@ -0,0 +1,30 @@
+# yapf: disable
+
+
+checkname = 'nginx_status'
+
+
+info = [['127.0.0.1', '80', 'Active', 'connections:',
'1'],
+ ['127.0.0.1', '80', 'serveracceptshandledrequests'],
+ ['127.0.0.1', '80', '12', '12', '12'],
+ ['127.0.0.1', '80', 'Reading:', '0',
'Writing:', '1', 'Waiting:', '0']]
+
+
+discovery = {'': [('127.0.0.1:80', {})]}
+
+
+checks = {'': [('127.0.0.1:80',
+ {},
+ [(0,
+ 'Active: 1 (0 reading, 1 writing, 0 waiting), Requests: 0.00/s
(1.00/Connection), Accepted/Handled: 0.00/s',
+ [('accepted', 12, None, None, None, None),
+ ('accepted_per_sec', 0.0, None, None, None, None),
+ ('active', 1, None, None, None, None),
+ ('handled', 12, None, None, None, None),
+ ('handled_per_sec', 0.0, None, None, None, None),
+ ('reading', 0, None, None, None, None),
+ ('requests', 12, None, None, None, None),
+ ('requests_per_conn', 1, None, None, None, None),
+ ('requests_per_sec', 0.0, None, None, None, None),
+ ('waiting', 0, None, None, None, None),
+ ('writing', 1, None, None, None, None)])])]}
\ No newline at end of file