Skip to content

Commit

Permalink
Merge pull request #2941 from clorichel/patch-1
Browse files Browse the repository at this point in the history 
now actually using the $controller and $namespace variables
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Aug 17, 2018
2 parents ab1072e + 6a1bbe9 commit b8feded
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions deploy/grafana/dashboards/nginx.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"iteration": 1531315229735,
"iteration": 1534359654832,
"links": [],
"panels": [
{
Expand Down Expand Up @@ -124,7 +124,7 @@
"tableColumn": "",
"targets": [
{
"expr": "round(sum(irate(nginx_ingress_controller_requests{controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m])), 0.001)",
"expr": "round(sum(irate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m])), 0.001)",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
Expand Down Expand Up @@ -206,7 +206,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(avg_over_time(nginx_ingress_controller_nginx_process_connections{controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m]))",
"expr": "sum(avg_over_time(nginx_ingress_controller_nginx_process_connections{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[1m]))",
"format": "time_series",
"instant": false,
"intervalFactor": 1,
Expand Down Expand Up @@ -289,7 +289,7 @@
"tableColumn": "",
"targets": [
{
"expr": "sum(rate(nginx_ingress_controller_requests{controller_class=~\"$controller_class\",namespace=~\"$namespace\",status!~\"[4-5].*\"}[1m])) / sum(rate(nginx_ingress_controller_requests{controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m]))",
"expr": "sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\",status!~\"[4-5].*\"}[1m])) / sum(rate(nginx_ingress_controller_requests{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m]))",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
Expand Down Expand Up @@ -372,7 +372,7 @@
"tableColumn": "",
"targets": [
{
"expr": "avg(nginx_ingress_controller_success{controller_class=~\"$controller_class\",namespace=~\"$namespace\"})",
"expr": "avg(nginx_ingress_controller_success{kubernetes_pod_name=~\"$controller\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"})",
"format": "time_series",
"instant": true,
"intervalFactor": 1,
Expand Down Expand Up @@ -456,7 +456,7 @@
"tableColumn": "",
"targets": [
{
"expr": "count(nginx_ingress_controller_config_last_reload_successful == 0)",
"expr": "count(nginx_ingress_controller_config_last_reload_successful{controller_pod=~\"$controller\",controller_namespace=~\"$namespace\"} == 0)",
"format": "time_series",
"instant": true,
"intervalFactor": 1,
Expand Down Expand Up @@ -526,7 +526,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum (irate (nginx_ingress_controller_request_size_sum{controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m]))",
"expr": "sum (irate (nginx_ingress_controller_request_size_sum{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[1m]))",
"format": "time_series",
"instant": false,
"interval": "10s",
Expand All @@ -537,7 +537,7 @@
"step": 10
},
{
"expr": "- sum (irate (nginx_ingress_controller_response_size_sum{controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m]))",
"expr": "- sum (irate (nginx_ingress_controller_response_size_sum{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[1m]))",
"format": "time_series",
"hide": false,
"interval": "10s",
Expand Down Expand Up @@ -641,7 +641,7 @@
"steppedLine": false,
"targets": [
{
"expr": "avg(nginx_ingress_controller_nginx_process_resident_memory_bytes{controller_class=~\"$controller_class\",namespace=~\"$namespace\"}) ",
"expr": "avg(nginx_ingress_controller_nginx_process_resident_memory_bytes{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}) ",
"format": "time_series",
"instant": false,
"interval": "10s",
Expand Down Expand Up @@ -743,7 +743,7 @@
"steppedLine": false,
"targets": [
{
"expr": "sum (rate (nginx_ingress_controller_nginx_process_cpu_seconds_total{controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m])) ",
"expr": "sum (rate (nginx_ingress_controller_nginx_process_cpu_seconds_total{controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[1m])) ",
"format": "time_series",
"interval": "10s",
"intervalFactor": 1,
Expand Down Expand Up @@ -971,7 +971,7 @@
],
"targets": [
{
"expr": "histogram_quantile(0.50, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m])) by (le, ingress))",
"expr": "histogram_quantile(0.50, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[1m])) by (le, ingress))",
"format": "table",
"hide": false,
"instant": true,
Expand All @@ -980,7 +980,7 @@
"refId": "C"
},
{
"expr": "histogram_quantile(0.90, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m])) by (le, ingress))",
"expr": "histogram_quantile(0.90, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[1m])) by (le, ingress))",
"format": "table",
"hide": false,
"instant": true,
Expand All @@ -989,7 +989,7 @@
"refId": "D"
},
{
"expr": "histogram_quantile(0.99, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m])) by (le, ingress))",
"expr": "histogram_quantile(0.99, sum(rate(nginx_ingress_controller_request_duration_seconds_bucket{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[1m])) by (le, ingress))",
"format": "table",
"hide": false,
"instant": true,
Expand All @@ -998,7 +998,7 @@
"refId": "E"
},
{
"expr": "sum(irate(nginx_ingress_controller_request_size_sum{ingress!=\"\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m])) by (ingress)",
"expr": "sum(irate(nginx_ingress_controller_request_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[1m])) by (ingress)",
"format": "table",
"hide": false,
"instant": true,
Expand All @@ -1008,7 +1008,7 @@
"refId": "F"
},
{
"expr": "sum(irate(nginx_ingress_controller_response_size_sum{ingress!=\"\",controller_class=~\"$controller_class\",namespace=~\"$namespace\"}[1m])) by (ingress)",
"expr": "sum(irate(nginx_ingress_controller_response_size_sum{ingress!=\"\",controller_pod=~\"$controller\",controller_class=~\"$controller_class\",controller_namespace=~\"$namespace\"}[1m])) by (ingress)",
"format": "table",
"instant": true,
"intervalFactor": 1,
Expand Down Expand Up @@ -1089,7 +1089,7 @@
],
"targets": [
{
"expr": "avg(nginx_ingress_controller_ssl_expire_time_seconds) by (host) - time()",
"expr": "avg(nginx_ingress_controller_ssl_expire_time_seconds{kubernetes_pod_name=~\"$controller\",namespace=~\"$namespace\"}) by (host) - time()",
"format": "time_series",
"intervalFactor": 1,
"legendFormat": "{{ host }}",
Expand Down Expand Up @@ -1124,7 +1124,7 @@
"multi": false,
"name": "namespace",
"options": [],
"query": "label_values(nginx_ingress_controller_config_hash{app=~\"$app\"}, namespace)",
"query": "label_values(nginx_ingress_controller_config_hash, controller_namespace)",
"refresh": 1,
"regex": "",
"sort": 0,
Expand Down

0 comments on commit b8feded

Please sign in to comment.