fix nginx entry in web dashboard

diff --git a/charts.d/nginx.chart.sh b/charts.d/nginx.chart.sh
index 9b75c2c5e68ae67ecf663b167e401ef470df22a2..a082c574e40fe5d945386458197d0e7eec1efdb9 100755 (executable)
--- a/charts.d/nginx.chart.sh
+++ b/charts.d/nginx.chart.sh
@@ -82,18 +82,18 @@ nginx_check() {
 # _create is called once, to create the charts
 nginx_create() {
        cat <<EOF
-CHART nginx.connections '' "nginx Active Connections" "connections" nginx nginx.connections line $((nginx_priority + 1)) $nginx_update_every
+CHART nginx_local.connections '' "nginx Active Connections" "connections" nginx nginx.connections line $((nginx_priority + 1)) $nginx_update_every
 DIMENSION active '' absolute 1 1
 
-CHART nginx.requests '' "nginx Requests" "requests/s" nginx nginx.requests line $((nginx_priority + 2)) $nginx_update_every
+CHART nginx_local.requests '' "nginx Requests" "requests/s" nginx nginx.requests line $((nginx_priority + 2)) $nginx_update_every
 DIMENSION requests '' incremental 1 1
 
-CHART nginx.connections_status '' "nginx Active Connections by Status" "connections" nginx nginx.connections.status line $((nginx_priority + 3)) $nginx_update_every
+CHART nginx_local.connections_status '' "nginx Active Connections by Status" "connections" nginx nginx.connections.status line $((nginx_priority + 3)) $nginx_update_every
 DIMENSION reading '' absolute 1 1
 DIMENSION writing '' absolute 1 1
 DIMENSION waiting idle absolute 1 1
 
-CHART nginx.connect_rate '' "nginx Connections Rate" "connections/s" nginx nginx.connections.rate line $((nginx_priority + 4)) $nginx_update_every
+CHART nginx_local.connect_rate '' "nginx Connections Rate" "connections/s" nginx nginx.connections.rate line $((nginx_priority + 4)) $nginx_update_every
 DIMENSION accepts accepted incremental 1 1
 DIMENSION handled '' incremental 1 1
 EOF
@@ -114,18 +114,18 @@ nginx_update() {
 
        # write the result of the work.
        cat <<VALUESEOF
-BEGIN nginx.connections $1
+BEGIN nginx_local.connections $1
 SET active = $((nginx_active_connections))
 END
-BEGIN nginx.requests $1
+BEGIN nginx_local.requests $1
 SET requests = $((nginx_requests))
 END
-BEGIN nginx.connections_status $1
+BEGIN nginx_local.connections_status $1
 SET reading = $((nginx_reading))
 SET writing = $((nginx_writing))
 SET waiting = $((nginx_waiting))
 END
-BEGIN nginx.connect_rate $1
+BEGIN nginx_local.connect_rate $1
 SET accepts = $((nginx_accepts))
 SET handled = $((nginx_handled))
 END

diff --git a/web/index.html b/web/index.html
index 69770e145e90c50cd76ca7704387146f0be0fbc3..f0a3b75de60cf57ce562377d81771e474c02a471 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -1367,11 +1367,11 @@ var menuData = {
                info: undefined,
        },
 
-/*     'nginx': {
+       'nginx': {
                title: 'nginx',
                info: undefined,
        },
-
+/*
        'apache': {
                title: 'Apache',
                info: undefined,