This repository was archived by the owner on Jun 29, 2022. It is now read-only.
Update grafana and other prometheus operator sub components#963
Merged
Update grafana and other prometheus operator sub components#963
Conversation
a0c7391 to
c739733
Compare
c739733 to
056f513
Compare
invidian
suggested changes
Sep 28, 2020
pkg/components/prometheus-operator/component_conversion_test.go
Outdated
Show resolved
Hide resolved
pkg/components/prometheus-operator/component_conversion_test.go
Outdated
Show resolved
Hide resolved
Member
|
BTW, should we upgrade to https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack and send those patches upstream? |
johananl
reviewed
Sep 28, 2020
Member
johananl
left a comment
There was a problem hiding this comment.
Seems to work OK.
Added some comments. The main issue seems to be wrong Grafana version.
assets/charts/components/prometheus-operator/charts/grafana/Chart.yaml
Outdated
Show resolved
Hide resolved
assets/charts/components/prometheus-operator/charts/kube-state-metrics/Chart.yaml
Show resolved
Hide resolved
assets/charts/components/prometheus-operator/charts/kube-state-metrics/README.md
Show resolved
Hide resolved
assets/charts/components/prometheus-operator/charts/kube-state-metrics/README.md
Show resolved
Hide resolved
pkg/components/prometheus-operator/component_conversion_test.go
Outdated
Show resolved
Hide resolved
pkg/components/prometheus-operator/component_conversion_test.go
Outdated
Show resolved
Hide resolved
pkg/components/prometheus-operator/component_conversion_test.go
Outdated
Show resolved
Hide resolved
pkg/components/prometheus-operator/component_conversion_test.go
Outdated
Show resolved
Hide resolved
pkg/components/prometheus-operator/component_conversion_test.go
Outdated
Show resolved
Hide resolved
assets/charts/components/prometheus-operator/charts/grafana/Chart.yaml
Outdated
Show resolved
Hide resolved
056f513 to
ba74a54
Compare
Member
Author
1 task
- Update kube-state-metrics to `2.9.1` application version `1.9.7`. - Update prometheus-node-exporter to `1.11.2` application version `1.0.1`. This chart is sourced from https://github.com/prometheus-community/helm-charts. - Update grafana to `5.7.10` application version `7.2.1`. This chart is sourced from https://github.com/grafana/helm-charts. Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
This commit enables the grafana to replicate the filesystem directory
structure in the dashboard.
If there are dashboards are laid out in the following structure, then in
dashboard also you can see this layout:
```
.
├── app1
│ └── dashboard.json
└── app2
└── dashboard.json
2 directories, 2 files
```
Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
This commit removes the manual override that was added in the prometheus-operator for Grafana. Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
- This commit adds new conversion test case to verify if the `foldersFromFilesStructure` is put in the configmap correctly. Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
ba74a54 to
2c3c905
Compare
invidian
approved these changes
Oct 16, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update prometheus-operator sub components
Update kube-state-metrics to
2.9.1application version1.9.7.Update prometheus-node-exporter to
1.11.2application version1.0.1. This chart is sourced fromhttps://github.com/prometheus-community/helm-charts.
Update grafana to
5.7.10application version7.2.1. This chart issourced from https://github.com/grafana/helm-charts.
prometheus-operator: Enable filesystem directory structure
This commit enables the grafana to replicate the filesystem directory
structure in the dashboard.
If there are dashboards are laid out in the following structure, then in
dashboard also you can see this layout:
prometheus-operator: Add conversion tests
foldersFromFilesStructureis put in the configmap correctly.TODO: