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.

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

Meta monitoring revamp #155

Draft
wants to merge 39 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
8976158
- Reorganized dashboards by product
Imshelledin21 Sep 18, 2024
5288d96
Merge pull request #1 from Imshelledin21/dashboards
Imshelledin21 Sep 18, 2024
5a3430e
Added Mimir and Tempo recording rules
Imshelledin21 Sep 18, 2024
1d943b8
Merge pull request #2 from Imshelledin21/recording-rules
Imshelledin21 Sep 18, 2024
3ac61f2
Alias Alloy Helm dependency to enable multiple deployments for metric…
Imshelledin21 Sep 18, 2024
171dd1e
Added ability to enable/disable alloy deployments
Imshelledin21 Sep 18, 2024
b71f769
Added in mimir and loki modules
Imshelledin21 Sep 18, 2024
ff4459c
Comments
Imshelledin21 Sep 18, 2024
813d026
Added metrics configs for Tempo and Grafana
Imshelledin21 Sep 18, 2024
ea6164f
Added configs for Alloy (non-meta-monitoring) and Self metric scrapes…
Imshelledin21 Sep 18, 2024
f19dc39
Added in node_exporter and kube_state_metrics
Imshelledin21 Sep 18, 2024
8472e20
Merge pull request #3 from Imshelledin21/alloy-metrics
Imshelledin21 Sep 18, 2024
a1444b4
Move metric modules to their own folder to separate from logs
Imshelledin21 Sep 18, 2024
92c1cc0
added in utils modules
Imshelledin21 Sep 18, 2024
4138b1d
Base configs for collecting logs
Imshelledin21 Sep 18, 2024
17607dc
base setup for meta-monitoring log collection
Imshelledin21 Sep 18, 2024
851e78a
Merge pull request #4 from Imshelledin21/alloy-logs
Imshelledin21 Sep 18, 2024
1ea66df
k8s events config
Imshelledin21 Sep 18, 2024
9f45a83
Cleaned up alloy log configs
Imshelledin21 Sep 19, 2024
f5bd76f
Merge pull request #5 from Imshelledin21/log-configs
Imshelledin21 Sep 19, 2024
fb6a145
Updated alloy configs for mimir, loki, grafana and alloy
Imshelledin21 Sep 19, 2024
b9a33e4
First pass at Alloy config cleanup
Imshelledin21 Sep 19, 2024
68a0cf3
Merge pull request #6 from Imshelledin21/alloy-metrics-config-cleanup
Imshelledin21 Sep 19, 2024
db5bcda
various alloy config updates
Imshelledin21 Sep 25, 2024
61ba3bd
Major cleanup of the helm chart and configurations.
Imshelledin21 Sep 25, 2024
73c116f
Merge pull request #7 from Imshelledin21/chart-cleanup
Imshelledin21 Sep 25, 2024
25795ea
minor clean up of various items
Imshelledin21 Sep 25, 2024
5e76ed4
Merge pull request #8 from Imshelledin21/chart-cleanup
Imshelledin21 Sep 25, 2024
351d3e2
Update alloy chart version to 0.7.0
Imshelledin21 Sep 25, 2024
27f3eb8
Merge pull request #9 from Imshelledin21/alloy-version-update
Imshelledin21 Sep 25, 2024
3b2234c
updates
Imshelledin21 Oct 4, 2024
b235957
Merge pull request #10 from Imshelledin21/alloy-version-update
Imshelledin21 Oct 4, 2024
9474d9a
Updates to configs
Imshelledin21 Oct 8, 2024
026a010
Updates to dashboards for job label
Imshelledin21 Oct 9, 2024
4083d23
All sorts of random updates
Imshelledin21 Oct 16, 2024
489b1ca
Documentation comments
Imshelledin21 Oct 16, 2024
971405e
Including an environment label value for metrics/logs
Imshelledin21 Oct 16, 2024
13ad5e5
Additional comments
Imshelledin21 Oct 16, 2024
c5409b7
Update to request limits
Imshelledin21 Oct 16, 2024
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
25 changes: 20 additions & 5 deletions charts/meta-monitoring/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,25 @@
dependencies:
- name: loki
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 6.6.2
version: 0.7.0
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.7.0
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.3.2
version: 0.7.0
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.7.0
- name: prometheus-node-exporter
repository: https://prometheus-community.github.io/helm-charts
version: 4.39.0
- name: kube-state-metrics
repository: https://prometheus-community.github.io/helm-charts
version: 5.25.1
- name: loki
repository: https://grafana.github.io/helm-charts
version: 6.6.2
- name: mimir-distributed
repository: https://grafana.github.io/helm-charts
version: 5.3.0
Expand All @@ -14,5 +29,5 @@ dependencies:
- name: minio
repository: https://charts.min.io
version: 5.2.0
digest: sha256:f62b04092f6e7e89e6a427b586e4c0cbfcd54ddbd411846770ee684cf86f822a
generated: "2024-06-03T07:02:47.330637227Z"
digest: sha256:392372cf41bae2bc475417ae7308f81f226f5c24a3557fe31a65338aad25b2f8
generated: "2024-10-09T07:39:50.634321671-05:00"
38 changes: 34 additions & 4 deletions charts/meta-monitoring/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,45 @@ version: 1.0.0
# 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.
# It is recommended to use it with quotes.
appVersion: "0.0.1"
appVersion: "0.0.2"
dependencies:

- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.7.0
alias: alloy-metrics
condition: alloy-metrics.enabled
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.7.0
alias: alloy-logs
condition: alloy-logs.enabled
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.7.0
alias: alloy-events
condition: alloy-events.enabled
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.7.0
alias: alloy-traces
condition: alloy-traces.enabled

- name: prometheus-node-exporter
repository: https://prometheus-community.github.io/helm-charts
version: 4.39.0
alias: node-exporter
condition: node-exporter.enabled
- name: kube-state-metrics
repository: https://prometheus-community.github.io/helm-charts
version: 5.25.1
alias: kube-state-metrics
condition: kube-state-metrics.enabled

- name: loki
repository: https://grafana.github.io/helm-charts
version: 6.6.2
condition: local.logs.enabled
- name: alloy
repository: https://grafana.github.io/helm-charts
version: 0.3.2
- name: mimir-distributed
repository: https://grafana.github.io/helm-charts
version: 5.3.0
Expand Down
Binary file removed charts/meta-monitoring/charts/alloy-0.3.2.tgz
Binary file not shown.
Binary file added charts/meta-monitoring/charts/alloy-0.7.0.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Loading