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

Compare commits

merge into: Public:add_loki_team_to_prs
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
...
pull from: Public:slim-bean-patch-1
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

12 Commits
add_loki_t ... slim-bean-

Author SHA1 Message Date
Ed Welch
55f3424118 Update Chart.yaml 2024-10-24 12:01:09 -04:00
Ed Welch
98e5ecd887 Merge pull request #157 from grafana/update-metrics-port 
update metrics port to look for `metrics` in the port name vs excludi…
 2024-10-24 11:46:06 -04:00
Edward Welch
58b438cdb5 update metrics port to look for metrics in the port name vs excluding ports 
add some more log lines
 2024-10-24 15:06:30 +00:00
J Stickler
c4af598b75 Merge pull request #147 from W0n9/main 
Fix typo in loki-reads.json
 2024-07-18 09:21:40 -04:00
TsungWing Wong
c78fe2d9fa Fix typo in loki-reads.json 
TSBD -> TSDB
 2024-07-17 13:38:58 +08:00
J Stickler
bae6e28b51 Merge pull request #146 from Vinaum8/patch-1 
Update installation.md
 2024-06-24 14:51:00 -04:00
Vinícius Fernandes
8f38e9508f Update installation.md 
Update line 94, grafana:true to grafana : true. =P
 2024-06-21 15:51:18 -03:00
Michel Hollands
de8a87dea1 Merge pull request #140 from grafana/chore/update-dependencies 
[dependency] Update the subcharts
 2024-06-03 08:43:45 +01:00
MichelHollands
48fad9f387 Update dependencies 2024-06-03 07:02:54 +00:00
Michel Hollands
4ec5f08646 Merge pull request #131 from grafana/add_loki_team_to_prs 
Add loki-squad as PR reviewers
 2024-05-31 15:21:35 +01:00
Michel Hollands
a1b66f0cd4 Merge pull request #138 from grafana/chore/update-dependencies 
[dependency] Update the subcharts
 2024-05-31 15:20:40 +01:00
MichelHollands
34bbe47d75 Update dependencies 2024-05-31 13:57:47 +00:00
12 changed files with 17 additions and 15 deletions
Expand all files Collapse all files

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

@@ -1,18 +1,18 @@
dependencies: dependencies:
- name: loki - name: loki
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 6.5.2 version: 6.6.2
- name: alloy - name: alloy
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 0.3.0 version: 0.3.2
- name: mimir-distributed - name: mimir-distributed
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 5.3.0 version: 5.3.0
- name: tempo-distributed - name: tempo-distributed
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 1.9.9 version: 1.10.0
- name: minio - name: minio
repository: https://charts.min.io repository: https://charts.min.io
version: 5.2.0 version: 5.2.0
digest: sha256:0eaa504de24724505fa4fff5169cd86628465ec366c253392c4ed24f15902b6b digest: sha256:f62b04092f6e7e89e6a427b586e4c0cbfcd54ddbd411846770ee684cf86f822a
generated: "2024-05-22T07:02:54.054326052Z" generated: "2024-06-03T07:02:47.330637227Z"

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

@@ -13,7 +13,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.0.0 version: 1.1.0
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to # incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using. # follow Semantic Versioning. They should reflect the version the application is using.
@@ -22,18 +22,18 @@ appVersion: "0.0.1"
dependencies: dependencies:
- name: loki - name: loki
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 6.5.2 version: 6.6.2
condition: local.logs.enabled condition: local.logs.enabled
- name: alloy - name: alloy
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 0.3.0 version: 0.9.2
- name: mimir-distributed - name: mimir-distributed
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 5.3.0 version: 5.3.0
condition: local.metrics.enabled condition: local.metrics.enabled
- name: tempo-distributed - name: tempo-distributed
repository: https://grafana.github.io/helm-charts repository: https://grafana.github.io/helm-charts
version: 1.9.9 version: 1.10.0
condition: local.traces.enabled condition: local.traces.enabled
- name: minio - name: minio
repository: https://charts.min.io repository: https://charts.min.io

BIN
charts/meta-monitoring/charts/alloy-0.3.0.tgz
View File

Binary file not shown.

BIN
charts/meta-monitoring/charts/alloy-0.3.2.tgz Normal file
View File

Binary file not shown.

BIN
charts/meta-monitoring/charts/loki-6.5.2.tgz
View File

Binary file not shown.

BIN
charts/meta-monitoring/charts/loki-6.6.2.tgz Normal file
View File

Binary file not shown.

BIN
charts/meta-monitoring/charts/tempo-distributed-1.10.0.tgz Normal file
View File

Binary file not shown.

BIN
charts/meta-monitoring/charts/tempo-distributed-1.9.9.tgz
View File

Binary file not shown.

4
charts/meta-monitoring/src/dashboards/loki-reads.json
View File

@@ -2449,7 +2449,7 @@
"repeatIteration": null, "repeatIteration": null,
"repeatRowId": null, "repeatRowId": null,
"showTitle": true, "showTitle": true,
"title": "TSBD Index", "title": "TSDB Index",
"titleSize": "h6" "titleSize": "h6"
}, },
{ {
@@ -2897,4 +2897,4 @@
"title": "Loki / Reads", "title": "Loki / Reads",
"uid": "reads", "uid": "reads",
"version": 0 "version": 0
} }

6
charts/meta-monitoring/templates/agent/config.yaml
View File

@@ -120,9 +120,9 @@ data:
replacement = "{{- .Values.clusterLabelValue -}}" replacement = "{{- .Values.clusterLabelValue -}}"
} }
rule { rule {
source_labels = ["__meta_kubernetes_pod_container_port_number"] source_labels = ["__meta_kubernetes_pod_container_port_name"]
action = "drop" action = "keep"
regex = "9095" regex = ".*metrics.*"
} }
} }

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

@@ -66,9 +66,11 @@ logs:
# The lines matching these will be kept in Loki # The lines matching these will be kept in Loki
retain: retain:
# This shows the queries # This shows the queries
- executing query
- caller=metrics.go - caller=metrics.go
# This shows any errors # This shows any errors
- level=error - level=error
- level=warn
# Log lines for delete requests # Log lines for delete requests
- delete request for user added - delete request for user added
- Started processing delete request - Started processing delete request

2
docs/installation.md
View File

@@ -91,7 +91,7 @@
local: local:
grafana: grafana:
enabled:true enabled: true
logs: logs:
enabled: true enabled: true
metrics: metrics: