fix nginx entry in web dashboard
paulfantom committed
Jul 8, 2016 at 12:10 UTC
f6f73aeaba9eef3a7105c5b8bd389be49e0595b0
2 files changed
+10
-10
charts.d/nginx.chart.sh
+8
-8
@@ -82,18 +82,18 @@ nginx_check() {
82
# _create is called once, to create the charts
83
nginx_create() {
84
cat <<EOF
85
-CHART nginx.connections '' "nginx Active Connections" "connections" nginx nginx.connections line $((nginx_priority + 1)) $nginx_update_every
85
+CHART nginx_local.connections '' "nginx Active Connections" "connections" nginx nginx.connections line $((nginx_priority + 1)) $nginx_update_every
86
DIMENSION active '' absolute 1 1
87
88
-CHART nginx.requests '' "nginx Requests" "requests/s" nginx nginx.requests line $((nginx_priority + 2)) $nginx_update_every
88
+CHART nginx_local.requests '' "nginx Requests" "requests/s" nginx nginx.requests line $((nginx_priority + 2)) $nginx_update_every
89
DIMENSION requests '' incremental 1 1
90
91
-CHART nginx.connections_status '' "nginx Active Connections by Status" "connections" nginx nginx.connections.status line $((nginx_priority + 3)) $nginx_update_every
91
+CHART nginx_local.connections_status '' "nginx Active Connections by Status" "connections" nginx nginx.connections.status line $((nginx_priority + 3)) $nginx_update_every
92
DIMENSION reading '' absolute 1 1
93
DIMENSION writing '' absolute 1 1
94
DIMENSION waiting idle absolute 1 1
95
96
-CHART nginx.connect_rate '' "nginx Connections Rate" "connections/s" nginx nginx.connections.rate line $((nginx_priority + 4)) $nginx_update_every
96
+CHART nginx_local.connect_rate '' "nginx Connections Rate" "connections/s" nginx nginx.connections.rate line $((nginx_priority + 4)) $nginx_update_every
97
DIMENSION accepts accepted incremental 1 1
98
DIMENSION handled '' incremental 1 1
99
EOF
@@ -114,18 +114,18 @@ nginx_update() {
114
115
# write the result of the work.
116
cat <<VALUESEOF
117
-BEGIN nginx.connections $1
117
+BEGIN nginx_local.connections $1
118
SET active = $((nginx_active_connections))
119
END
120
-BEGIN nginx.requests $1
120
+BEGIN nginx_local.requests $1
121
SET requests = $((nginx_requests))
122
END
123
-BEGIN nginx.connections_status $1
123
+BEGIN nginx_local.connections_status $1
124
SET reading = $((nginx_reading))
125
SET writing = $((nginx_writing))
126
SET waiting = $((nginx_waiting))
127
END
128
-BEGIN nginx.connect_rate $1
128
+BEGIN nginx_local.connect_rate $1
129
SET accepts = $((nginx_accepts))
130
SET handled = $((nginx_handled))
131
END
web/index.html
+2
-2
@@ -1367,11 +1367,11 @@ var menuData = {
1367
info: undefined,
1368
},
1369
1370
-/* 'nginx': {
1370
+ 'nginx': {
1371
title: 'nginx',
1372
info: undefined,
1373
},
1374
-
1374
+/*
1375
'apache': {
1376
title: 'Apache',
1377
info: undefined,