Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

Update grafana and other prometheus operator sub components #963

Merged
merged 5 commits into from
Oct 16, 2020

Conversation

surajssd
Copy link
Member

@surajssd surajssd commented Sep 14, 2020

Update prometheus-operator sub components


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:

.
├── app1
│   └── dashboard.json
└── app2
    └── dashboard.json

2 directories, 2 files

prometheus-operator: Add conversion tests

  • This commit adds new conversion test to verify if the
    foldersFromFilesStructure is put in the configmap correctly.

TODO:

  • Write Tests.
  • Format this description.
  • The Grafana chart and prometheus-node-exporter charts are sourced from different place. Add this in commit.

@surajssd surajssd force-pushed the surajssd/update-grafana branch 3 times, most recently from a0c7391 to c739733 Compare September 25, 2020 09:55
@surajssd surajssd marked this pull request as ready for review September 25, 2020 09:56
@invidian
Copy link
Member

BTW, should we upgrade to https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack and send those patches upstream?

Copy link
Member

@johananl johananl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to work OK.

Added some comments. The main issue seems to be wrong Grafana version.

@surajssd
Copy link
Member Author

surajssd commented Oct 5, 2020

@johananl @invidian PTAL

- 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>
@surajssd surajssd merged commit 6166864 into master Oct 16, 2020
@surajssd surajssd deleted the surajssd/update-grafana branch October 16, 2020 14:21
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants