From a124cfebe07d78fb8b994d397ee481150e7300f3 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Wed, 19 May 2021 16:02:57 -0400 Subject: [PATCH 1/3] OpenNMS Helm Grafana Plugin 7.1.0 This release adds support for handling aggregate flow DSCP ToS/QoS values, coming soon in Helm 28. It also bumps some dependencies, and fixes a bug in the filter panel where not all values would be shown in select boxes. --- CHANGELOG.md | 6 ++++++ docs/antora.yml | 2 +- package-lock.json | 2 +- package.json | 2 +- src/plugin.json | 4 ++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9016695f..ada01621 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### v7.1.0 + +This release adds support for handling aggregate flow DSCP ToS/QoS values, coming soon in Helm 28. +It also bumps some dependencies, and fixes a bug in the filter panel where not all values would +be shown in select boxes. + ### v7.0.0 This release contains a rework of our code to use TypeScript, and a conversion to Grafana's diff --git a/docs/antora.yml b/docs/antora.yml index 9108a8de..efc93d4f 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,5 +1,5 @@ name: helm -version: '7.0.1-SNAPSHOT' +version: '7.1.0' title: HELM nav: - modules/ROOT/nav.adoc diff --git a/package-lock.json b/package-lock.json index 5076bd1b..4acf43f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "opennms-helm", - "version": "7.0.1-SNAPSHOT", + "version": "7.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4dd700d4..2abc9665 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opennms-helm", - "version": "7.0.1-SNAPSHOT", + "version": "7.1.0", "description": "An OpenNMS Integration for Grafana", "repository": { "type": "git", diff --git a/src/plugin.json b/src/plugin.json index 7e442e34..033ba10f 100644 --- a/src/plugin.json +++ b/src/plugin.json @@ -24,8 +24,8 @@ {"name": "Metrics", "path": "img/Helm_Screenshot_Metrics.png"}, {"name": "Performance Data Source", "path": "img/Helm_Screenshot_Performance_Data_Source.png"} ], - "version": "7.0.1-SNAPSHOT", - "updated": "2021-05-10" + "version": "7.1.0", + "updated": "2021-05-19" }, "includes": [ {"type": "panel", "name": "Alarm Table"}, From 35222c6bd616afb2556ce326e6643b4b924ffcae Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 20 May 2021 15:25:44 -0400 Subject: [PATCH 2/3] update circle for release-7.x --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bff906d2..394fe37c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,19 +37,19 @@ defaults: &defaults from_branch: description: the auto-merge source branch type: string - default: develop + default: release-7.x from_branch_label: description: the auto-merge source branch (escaped, no slashes) type: string - default: develop + default: release-7.x to_branch: description: the auto-merge target branch type: string - default: master + default: develop to_branch_label: description: the auto-merge target branch (escaped, no slashes) type: string - default: master + default: develop docker_container_config: &docker_container_config executor: docker-executor From e7e5fdfc9db57769bedccbedbe07bd05eda664f6 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Thu, 20 May 2021 15:26:17 -0400 Subject: [PATCH 3/3] Revert "update circle for release-7.x" This reverts commit 35222c6bd616afb2556ce326e6643b4b924ffcae. --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 394fe37c..bff906d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,19 +37,19 @@ defaults: &defaults from_branch: description: the auto-merge source branch type: string - default: release-7.x + default: develop from_branch_label: description: the auto-merge source branch (escaped, no slashes) type: string - default: release-7.x + default: develop to_branch: description: the auto-merge target branch type: string - default: develop + default: master to_branch_label: description: the auto-merge target branch (escaped, no slashes) type: string - default: develop + default: master docker_container_config: &docker_container_config executor: docker-executor