Skip to content

Commit

Permalink
Merge pull request #8754 from sbueringer/pr-scale-dashboard
Browse files Browse the repository at this point in the history
✨ hack/observability: Add Parca, Bump observability tools, Add Grafana scale dashboard
  • Loading branch information
k8s-ci-robot authored May 31, 2023
2 parents 7fd9598 + d6537c6 commit 89429b8
Show file tree
Hide file tree
Showing 13 changed files with 4,762 additions and 18 deletions.
6 changes: 5 additions & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,10 @@ def deploy_observability():
k8s_yaml(read_file("./.tiltbuild/yaml/kube-state-metrics.observability.yaml"), allow_duplicates = True)
k8s_resource(workload = "kube-state-metrics", new_name = "kube-state-metrics", extra_pod_selectors = [{"app": "kube-state-metrics"}], labels = ["observability"], objects = ["kube-state-metrics:serviceaccount"])

if "parca" in settings.get("deploy_observability", []):
k8s_yaml(read_file("./.tiltbuild/yaml/parca.observability.yaml"), allow_duplicates = True)
k8s_resource(workload = "parca", new_name = "parca", port_forwards = "7070", extra_pod_selectors = [{"app": "parca"}], labels = ["observability"], objects = ["parca:serviceaccount"])

if "visualizer" in settings.get("deploy_observability", []):
k8s_yaml(read_file("./.tiltbuild/yaml/visualizer.observability.yaml"), allow_duplicates = True)
k8s_resource(
Expand Down Expand Up @@ -461,7 +465,7 @@ def cluster_templates():
substitutions["NAMESPACE"] = substitutions.get("NAMESPACE", "default")
substitutions["KUBERNETES_VERSION"] = substitutions.get("KUBERNETES_VERSION", kubernetes_version)
substitutions["CONTROL_PLANE_MACHINE_COUNT"] = substitutions.get("CONTROL_PLANE_MACHINE_COUNT", "1")
substitutions["WORKER_MACHINE_COUNT"] = substitutions.get("WORKER_MACHINE_COUNT", "3")
substitutions["WORKER_MACHINE_COUNT"] = substitutions.get("WORKER_MACHINE_COUNT", "1")

template_dirs = settings.get("template_dirs", {
"docker": ["./test/infrastructure/docker/templates"],
Expand Down
7 changes: 7 additions & 0 deletions hack/observability/grafana/chart/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
helmCharts:
- name: grafana
repo: https://grafana.github.io/helm-charts
releaseName: grafana
namespace: observability
valuesFile: values.yaml
version: 6.56.5
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,22 @@ datasources:
type: prometheus
url: http://prometheus-server

dashboardProviders:
dashboardproviders.yaml:
apiVersion: 1
providers:
- name: 'default'
orgId: 1
folder: ''
type: file
disableDeletion: false
editable: true
options:
path: /var/lib/grafana/dashboards/default

dashboardsConfigMaps:
default: grafana-dashboards

# Disable grafana test framework
testFramework:
enabled: false
Expand Down
Loading

0 comments on commit 89429b8

Please sign in to comment.