Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add grafana agent as dependency + fix some templates #622

Merged
merged 6 commits into from
Apr 5, 2023
Merged

fix: add grafana agent as dependency + fix some templates #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e224fd
fix(trace-shield): add grafana agent as dependency
davidspek Apr 5, 2023
4825477
fix other templates
davidspek Apr 5, 2023
1d518d4
use var
davidspek Apr 5, 2023
5f1171e
fix trace shield
davidspek Apr 5, 2023
e8d7e95
fix typo
davidspek Apr 5, 2023
eb579e1
use var in monitoring
davidspek Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion loki/helm/loki/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: loki
description: helm chart for loki
type: application
version: 0.1.14
version: 0.1.15
appVersion: "v2.6.1"
dependencies:
- name: loki-distributed
Expand Down
5 changes: 3 additions & 2 deletions loki/helm/loki/values.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{ $traceShield := and .Configuration (index .Configuration "grafana-agent") }}
{{ $traceShield := and .Configuration (index .Configuration "trace-shield") }}
{{ $grafanaAgent := and .Configuration (index .Configuration "grafana-agent") }}
{{ $redisNamespace := namespace "redis" }}
{{ $redisValues := .Applications.HelmValues "redis" }}
{{ $monitoringNamespace := namespace "monitoring" }}
Expand All @@ -16,7 +17,7 @@ basicAuth:
password: {{ .Values.basicAuth.password }}
{{- end }}

{{- if $traceShield }}
{{- if $grafanaAgent }}
promtail:
enabled: false
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion mimir/helm/mimir/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: mimir
description: helm chart for mimir
type: application
version: 0.1.1
version: 0.1.2
appVersion: 2.7.1
dependencies:
- name: mimir-distributed
Expand Down
2 changes: 1 addition & 1 deletion mimir/helm/mimir/values.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{ $traceShield := (dig "Configuration" "trace-shield" .) }}
{{ $traceShield := and .Configuration (index .Configuration "trace-shield") }}

{{- if eq .Provider "azure" }}
global:
Expand Down
2 changes: 1 addition & 1 deletion monitoring/helm/monitoring/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: monitoring
description: A Helm chart for Kubernetes
type: application
version: 0.2.25
version: 0.2.26
appVersion: "0.1.0"
dependencies:
- name: kube-prometheus-stack
Expand Down
5 changes: 3 additions & 2 deletions monitoring/helm/monitoring/values.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{ $grafanaAgent := and .Configuration (index .Configuration "grafana-agent") }}
global:
rbac:
pspEnabled: false
Expand All @@ -6,12 +7,12 @@ global:
kube-prometheus-stack:
grafana:
namespaceOverride: {{ $monitoringNamespace }}
{{- if dig "Configuration" "grafana-agent" . }}
{{- if $grafanaAgent }}
alertmanager:
enabled: false
{{- end }}
prometheus:
{{- if dig "Configuration" "grafana-agent" . }}
{{- if $grafanaAgent }}
enabled: false
{{- end }}
prometheusSpec:
Expand Down
2 changes: 1 addition & 1 deletion trace-shield/helm/trace-shield/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: trace-shield
description: helm chart for trace-shield
type: application
version: 0.1.2
version: 0.1.3
appVersion: "v0.1.1"
dependencies:
- name: kratos
Expand Down
4 changes: 4 additions & 0 deletions trace-shield/helm/trace-shield/deps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ spec:
name: postgres
repo: postgres
version: ">= 0.1.6"
- type: helm
name: grafana-agent
repo: grafana-agent
version: ">= 0.1.0"
- type: terraform
name: kube
repo: trace-shield
Expand Down
2 changes: 2 additions & 0 deletions trace-shield/plural/recipes/trace-shield-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ dependencies:
name: ingress-nginx-aws
- repo: postgres
name: aws-postgres
- repo: grafana-agent
name: grafana-agent-aws
sections:
- name: trace-shield
configuration:
Expand Down
2 changes: 2 additions & 0 deletions trace-shield/plural/recipes/trace-shield-azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ dependencies:
name: ingress-nginx-azure
- repo: postgres
name: azure-postgres
- repo: grafana-agent
name: grafana-agent-azure
sections:
- name: trace-shield
configuration:
Expand Down
2 changes: 2 additions & 0 deletions trace-shield/plural/recipes/trace-shield-gcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ dependencies:
name: ingress-nginx-gcp
- repo: postgres
name: gcp-postgres
- repo: grafana-agent
name: grafana-agent-gcp
sections:
- name: trace-shield
configuration:
Expand Down