Public/grafana-meta-monitoring-chart
2
0
Fork 0
forked from RemoteSync/grafana-meta-monitoring-chart
Code Pull Requests Activity

Compare commits

base: Public:add_ci
Branches Tags
Public:main Public:modified Public:chore/update-dependencies Public:chore/update-minio Public:slim-bean-patch-1 Public:update-metrics-port Public:add_loki_team_to_prs Public:test_branch Public:update_version Public:update_main_page Public:cleanup_ci Public:add_ci_install Public:add_ksm_docs Public:fix_cluster_name Public:fix_dashboards Public:fix_loki_write_endpoint Public:fix_traces_forwarding Public:change_default_sampling_type Public:update_ingress_documentation Public:create_new_version Public:add_more_metrics Public:fix_rules Public:remove_rules_files_mimir_tempo Public:split_up_grafana_template Public:remove_redundant_variables Public:fix_dependency_check Public:chore/update-tempo-distributed Public:fix_alloy_config_for_traces Public:fix_minio_secret_name Public:combine_ci Public:update_grafana Public:chore/update-loki Public:use_secret_for_minio Public:set_step_time_to_1_minute_in_dashboards Public:add_extra_metrics Public:more_dashboard_cleanup Public:remove_non_loki_dashboards Public:open_extra_ports_for_otlp Public:get_logs_from_all_namespaces Public:fix_correct_version Public:fix_logic_for_secrets Public:use_updated_dashboards2 Public:filter_cadvisor_kubelet_metrics_on_namespace Public:add_creation_of_dashboard Public:more_docs_fixes Public:add_more_docs Public:update_installation_instructions Public:fix_release_flow Public:add_ci_to_release_helm_chart Public:remove_reviewers Public:chore/update-grafana-alloy Public:chore/update-mimir-distributed Public:fix_action Public:add_helm_chart_updater Public:add_agent_metrics Public:filter_out_errors_local_loki Public:filter_log_lines Public:filter_only_important_log_lines Public:remove_helm_test_step Public:add_create_kind_cluster_to_ci Public:add_lint_to_ci Public:add_ci Public:add_skip_cdrs_to_installation_step Public:add_retention Public:fix_tempo_dashboards Public:fix_mimir_dashboards Public:add_agent_dashboards Public:add_ruler Public:add_tempo_dashboards.yaml Public:add_scraping_of_cadvisor Public:add_mimir_dashboards Public:use_loki_ssd_dashboards Public:add_kube_state_metrics_scraping Public:add_regexes_to_filter_log_lines Public:add_validation Public:enable_dbs_individually Public:add_minio
Public:v1.3.0 Public:v1.2.0 Public:v1.1.0 Public:v1.0.0 Public:v0.0.3 Public:v0.0.2 Public:v0.0.1
..
compare: Public:add_lint_to_ci
Branches Tags
Public:modified Public:chore/update-dependencies Public:main Public:chore/update-minio Public:slim-bean-patch-1 Public:update-metrics-port Public:add_loki_team_to_prs Public:test_branch Public:update_version Public:update_main_page Public:cleanup_ci Public:add_ci_install Public:add_ksm_docs Public:fix_cluster_name Public:fix_dashboards Public:fix_loki_write_endpoint Public:fix_traces_forwarding Public:change_default_sampling_type Public:update_ingress_documentation Public:create_new_version Public:add_more_metrics Public:fix_rules Public:remove_rules_files_mimir_tempo Public:split_up_grafana_template Public:remove_redundant_variables Public:fix_dependency_check Public:chore/update-tempo-distributed Public:fix_alloy_config_for_traces Public:fix_minio_secret_name Public:combine_ci Public:update_grafana Public:chore/update-loki Public:use_secret_for_minio Public:set_step_time_to_1_minute_in_dashboards Public:add_extra_metrics Public:more_dashboard_cleanup Public:remove_non_loki_dashboards Public:open_extra_ports_for_otlp Public:get_logs_from_all_namespaces Public:fix_correct_version Public:fix_logic_for_secrets Public:use_updated_dashboards2 Public:filter_cadvisor_kubelet_metrics_on_namespace Public:add_creation_of_dashboard Public:more_docs_fixes Public:add_more_docs Public:update_installation_instructions Public:fix_release_flow Public:add_ci_to_release_helm_chart Public:remove_reviewers Public:chore/update-grafana-alloy Public:chore/update-mimir-distributed Public:fix_action Public:add_helm_chart_updater Public:add_agent_metrics Public:filter_out_errors_local_loki Public:filter_log_lines Public:filter_only_important_log_lines Public:remove_helm_test_step Public:add_create_kind_cluster_to_ci Public:add_lint_to_ci Public:add_ci Public:add_skip_cdrs_to_installation_step Public:add_retention Public:fix_tempo_dashboards Public:fix_mimir_dashboards Public:add_agent_dashboards Public:add_ruler Public:add_tempo_dashboards.yaml Public:add_scraping_of_cadvisor Public:add_mimir_dashboards Public:use_loki_ssd_dashboards Public:add_kube_state_metrics_scraping Public:add_regexes_to_filter_log_lines Public:add_validation Public:enable_dbs_individually Public:add_minio
Public:v1.3.0 Public:v1.2.0 Public:v1.1.0 Public:v1.0.0 Public:v0.0.3 Public:v0.0.2 Public:v0.0.1

3 Commits
add_ci ... add_lint_t

Author SHA1 Message Date
Michel Hollands
86ec586917 Fix typo 
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
 2023-08-17 10:31:56 +01:00
Michel Hollands
6cd12bee01 Add linted rule files 
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
 2023-08-17 10:29:24 +01:00
Michel Hollands
b042b396a2 Temp checkin 
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
 2023-08-17 10:27:42 +01:00
9 changed files with 20 additions and 112 deletions
Expand all files Collapse all files

81
.github/workflows/helm-ci.yml vendored
View File

@@ -16,86 +16,5 @@ jobs:
- name: Checkout Code
uses: actions/checkout@v3
# - name: Check Docs
# run: |
# docker run --rm --volume "$(pwd):/helm-docs" -u "$(id -u)" jnorwood/helm-docs:v1.11.0
# if ! git diff --exit-code; then
# echo "Documentation not up to date. Please run helm-docs and commit changes!" >&2
# exit 1
# fi
- name: Lint Yaml
run: make helm-lint
# - name: Lint Code Base
# uses: docker://github/super-linter:v3.12.0
# env:
# FILTER_REGEX_EXCLUDE: .*(README\.md|Chart\.yaml|NOTES.txt).*
# FILTER_REGEX_INCLUDE: .*charts/meta-monitoring/.*
# VALIDATE_ALL_CODEBASE: false
# VALIDATE_KUBERNETES_KUBEVAL: false
# VALIDATE_YAML: false
# VALIDATE_GO: false
# DEFAULT_BRANCH: main
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
call-test:
name: Test Helm Chart
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Helm
uses: azure/setup-helm@v3
with:
version: v3.8.2
# Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
# yamllint (https://github.com/adrienverge/yamllint) which require Python
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.7
- name: Set up chart-testing
uses: helm/chart-testing-action@v2.4.0
- name: Run chart-testing (list-changed)
id: list-changed
run: |
changed=$(ct list-changed --config "${CT_CONFIGFILE}")
if [[ -n "$changed" ]]; then
echo "changed=true" >> $GITHUB_OUTPUT
fi
- name: Run chart-testing (lint)
run: ct lint --config "${CT_CONFIGFILE}" --check-version-increment=false
- name: Create kind cluster
uses: helm/kind-action@v1.8.0
if: steps.list-changed.outputs.changed == 'true'
# - name: Install prometheus operator
# id: install-prometheus
# if: steps.list-changed.outputs.changed == 'true'
# run: |
# kubectl create namespace prometheus
# helm install prometheus prometheus-community/kube-prometheus-stack \
# --namespace prometheus \
# --set grafana.enabled=false \
# --set prometheus.prometheusSpec.serviceMonitorSelector.matchLabels.release=prometheus
# kubectl --namespace prometheus get pods -l "release=prometheus"
# kubectl --namespace prometheus get services -l "release=prometheus"
- name: Run chart-testing (install)
run: |
changed=$(ct list-changed --config "${CT_CONFIGFILE}")
if [[ "$changed" == "charts/enterprise-metrics" ]]; then
# Do not run `ct install` for enterprise-metrics
exit 0
fi
ct install --config "${CT_CONFIGFILE}"

2
Makefile
View File

@@ -6,5 +6,5 @@ help:
.PHONY: helm-lint
helm-lint: ## run helm linter
helm-lint: ## Run helm linter
$(MAKE) -BC charts/meta-monitoring lint

4
charts/meta-monitoring/Chart.lock
View File

@@ -14,5 +14,5 @@ dependencies:
- name: minio
repository: https://charts.min.io
version: 5.0.11
digest: sha256:da0e744b5046eb7972e0bf82d1d0ba4786e9600af63b65f35b16118105248074
generated: "2023-08-16T16:08:36.406791+01:00"
digest: sha256:4b04084e6fe821c4d481017b2430f7c8cd782a5d60830dd3a24eb8f10a9ece09
generated: "2023-06-29T14:25:07.247853+01:00"

10
charts/meta-monitoring/Chart.yaml
View File

@@ -25,21 +25,21 @@ appVersion: "0.0.1"
dependencies:
- name: loki
repository: https://grafana.github.io/helm-charts
repository: https://grafana.github.io/helm-charts
version: "5.8.0"
condition: local.logs.enabled
- name: grafana-agent
repository: https://grafana.github.io/helm-charts
repository: https://grafana.github.io/helm-charts
version: "0.15.0"
- name: mimir-distributed
repository: https://grafana.github.io/helm-charts
repository: https://grafana.github.io/helm-charts
version: "4.4.1"
condition: local.metrics.enabled
- name: tempo-distributed
repository: https://grafana.github.io/helm-charts
repository: https://grafana.github.io/helm-charts
version: "1.4.7"
condition: local.traces.enabled
- name: minio
repository: https://charts.min.io
version: "5.0.11"
condition: local.minio.enabled
condition: local.minio.enabled

2
charts/meta-monitoring/Makefile
View File

@@ -1,4 +1,4 @@
.DEFAULT_GOAL := all
.DEFAULT_GOAL := lint
.PHONY: lint lint-yaml
lint: lint-yaml

11
charts/meta-monitoring/ct.yaml
View File

@@ -1,11 +0,0 @@
---
remote: origin
target-branch: main
chart-dirs:
- charts
chart-repos:
- grafana=https://grafana.github.io/helm-charts
- minio=https://charts.min.io
helm-extra-args: --timeout 1200s
check-version-increment: false
validate-maintainers: false

2
charts/meta-monitoring/templates/grafana/agent-dashboards-1.yaml
View File

@@ -14,6 +14,6 @@ data:
{{ $.Files.Get "src/dashboards/agent-remote-write.json" | fromJson | toJson }}
"agent-tracing-pipeline.json": |
{{ $.Files.Get "src/dashboards/agent-tracing-pipeline.json" | fromJson | toJson }}
"agent-overview.json": |
"agent.json": |
{{ $.Files.Get "src/dashboards/agent.json" | fromJson | toJson }}
{{- end }}

4
charts/meta-monitoring/templates/ruler/ruler.yaml
View File

@@ -3,7 +3,7 @@ apiVersion: apps/v1
kind: Deployment
metadata:
name: meta-mimir-ruler-for-dashboards
namespace: {{ $.Release.Namespace }}
namespace: meta
spec:
progressDeadlineSeconds: 600
replicas: 1
@@ -24,7 +24,7 @@ spec:
app.kubernetes.io/component: ruler-for-dashboards
app.kubernetes.io/instance: meta
app.kubernetes.io/name: mimir
namespace: {{ $.Release.Namespace }}
namespace: meta
spec:
containers:
- args:

16
charts/meta-monitoring/values.yaml
View File

@@ -9,28 +9,28 @@ clusterName: "meta-monitoring"
# Set to true for a local version of logs, metrics or traces
local:
logs:
enabled: true
enabled: false
metrics:
enabled: true
enabled: false
traces:
enabled: true
enabled: false
minio:
enabled: true # This should be set to true if any of the previous is enabled
enabled: false # This should be set to true if any of the previous is enabled
# Set to true to write logs, metrics or traces to Grafana Cloud
cloud:
logs:
enabled: false
enabled: true
endpoint:
username:
password:
metrics:
enabled: false
enabled: true
endpoint:
username:
password:
traces:
enabled: false
enabled: true
endpoint:
username:
password:
@@ -193,4 +193,4 @@ minio:
cpu: 100m
memory: 128Mi
# Changed the mc config path to '/tmp' from '/etc' as '/etc' is only writable by root and OpenShift will not permit this.
configPathmc: "/tmp/minio/mc/"
configPathmc: "/tmp/minio/mc/"