This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 68af0ac2db3 HDDS-15285. Pin Grafana to 13.0.1+security-01, fix
outdated config (#10278)
68af0ac2db3 is described below
commit 68af0ac2db3612ee6e82bb9c23289f6311d2b346
Author: Sadanand Shenoy <[email protected]>
AuthorDate: Fri May 15 21:43:58 2026 +0530
HDDS-15285. Pin Grafana to 13.0.1+security-01, fix outdated config (#10278)
---
.../grafana/provisioning/dashboards/dashboards.yml | 17 +++++++++++------
.../grafana/provisioning/datasources/datasources.yml | 17 +++++++++--------
.../dist/src/main/compose/ozone/monitoring.yaml | 2 +-
3 files changed, 21 insertions(+), 15 deletions(-)
diff --git
a/hadoop-ozone/dist/src/main/compose/common/grafana/provisioning/dashboards/dashboards.yml
b/hadoop-ozone/dist/src/main/compose/common/grafana/provisioning/dashboards/dashboards.yml
index 1485f72e4ea..06dbe2eed1a 100755
---
a/hadoop-ozone/dist/src/main/compose/common/grafana/provisioning/dashboards/dashboards.yml
+++
b/hadoop-ozone/dist/src/main/compose/common/grafana/provisioning/dashboards/dashboards.yml
@@ -14,9 +14,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-- name: 'default'
- org_id: 1
- folder: ''
- type: 'file'
- options:
- folder: '/var/lib/grafana/dashboards'
+apiVersion: 1
+
+providers:
+ - name: 'default'
+ orgId: 1
+ folder: ''
+ type: file
+ disableDeletion: false
+ editable: true
+ options:
+ path: /var/lib/grafana/dashboards
diff --git
a/hadoop-ozone/dist/src/main/compose/common/grafana/provisioning/datasources/datasources.yml
b/hadoop-ozone/dist/src/main/compose/common/grafana/provisioning/datasources/datasources.yml
index 4d33c2305c9..e5362803301 100755
---
a/hadoop-ozone/dist/src/main/compose/common/grafana/provisioning/datasources/datasources.yml
+++
b/hadoop-ozone/dist/src/main/compose/common/grafana/provisioning/datasources/datasources.yml
@@ -14,12 +14,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+apiVersion: 1
+
datasources:
-- name: 'Prometheus'
- type: 'prometheus'
- access: 'proxy'
- org_id: 1
- url: 'http://prometheus:9090'
- is_default: true
- version: 1
- editable: true
+ - name: Prometheus
+ type: prometheus
+ access: proxy
+ orgId: 1
+ url: http://prometheus:9090
+ isDefault: true
+ editable: true
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/monitoring.yaml
b/hadoop-ozone/dist/src/main/compose/ozone/monitoring.yaml
index 2ce5a725da6..0afae352e34 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone/monitoring.yaml
+++ b/hadoop-ozone/dist/src/main/compose/ozone/monitoring.yaml
@@ -34,7 +34,7 @@ services:
ports:
- 9090:9090
grafana:
- image: grafana/grafana
+ image: grafana/grafana:13.0.1-security-01
volumes:
- "../common/grafana/dashboards:/var/lib/grafana/dashboards"
- "../common/grafana/provisioning:/etc/grafana/provisioning"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
