Merge branch 'main' into e2e-zipkin

envoyproxy · Jul 19, 2024 · ba49e94 · ba49e94
2 parents c77f64e + cdfcf3d
commit ba49e94
Show file tree

Hide file tree

Showing 86 changed files with 2,222 additions and 1,783 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,9 @@ charts/gateway-helm/values.yaml
 # dependency charts generated by addons helm.
 charts/gateway-addons-helm/charts/
 
+# vendor for grafonnet
+charts/gateway-addons-helm/dashboards/vendor/
+
 # VIM
 .*.swp
 

diff --git a/charts/gateway-addons-helm/.helmignore b/charts/gateway-addons-helm/.helmignore
@@ -21,3 +21,8 @@
 .idea/
 *.tmproj
 .vscode/
+# Vendor and configs for Jsonnet and Grafonnet
+dashboards/lib/
+dashboards/vendor/
+dashboards/jsonnetfile.json
+dashboards/jsonnetfile.lock.json
diff --git a/charts/gateway-addons-helm/dashboards/envoy-gateway-resource.json b/charts/gateway-addons-helm/dashboards/envoy-gateway-resource.json