Merge branch 'master' into 'release-6.0.1'

Update cfg-kpl-nginx.yaml.j2

See merge request !6

kpl/cfg-kpl-nginx.yaml.j2

@@ -54,17 +54,6 @@ data:
         client_max_body_size  10240m;
         client_max_body_size  10240m;
     }
     }
 
 
-    location /grafana {
-        root   html;
-        index  index.html index.htm;
-        add_header 'Access-Control-Allow-Origin' '*';
-        add_header Access-Control-Allow-Methods GET,POST,OPTIONS,DELETE;
-        add_header 'Access-Control-Allow-Headers' 'userId,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-        proxy_pass http://wd-grafana.autodl.svc.cluster.local:3000;
-        rewrite ^/grafana/(.*) /$1 break;
-        proxy_set_header   Host $host;
-    }
-
     location = /basic_status {
     location = /basic_status {
         stub_status;
         stub_status;
     }
     }
@@ -139,17 +128,6 @@ data:
             client_max_body_size  10240m;
             client_max_body_size  10240m;
         }
         }
 
 
-        location /grafana {
-            root   html;
-            index  index.html index.htm;
-            add_header 'Access-Control-Allow-Origin' '*';
-            add_header Access-Control-Allow-Methods GET,POST,OPTIONS,DELETE;
-            add_header 'Access-Control-Allow-Headers' 'userId,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-            proxy_pass http://wd-grafana.autodl.svc.cluster.local:3000;
-            rewrite ^/grafana/(.*) /$1 break;
-            proxy_set_header   Host $host;
-        }
-
         location = /basic_status {
         location = /basic_status {
             stub_status;
             stub_status;
         }
         }