Merge remote-tracking branch 'origin/develop'

Author: opennms-bamboo

README.md

@@ -54,6 +54,14 @@ We use the Helm project in our [JIRA](https://issues.opennms.org/projects/HELM)
 
 ## Changelog
 
+### v6.0.0
+
+OpenNMS Helm now supports Grafana 7, and has dropped support for versions older than 7.
+
+* the `nodeResources()` function has been enhanced to support
+  displaying the resource label (Issue [HELM-95](https://issues.opennms.org/browse/HELM-95))
+* the Filter and Alarm Table panels have been updated to work with Grafana 7 (Issue [HELM-247](https://issues.opennms.org/browse/HELM-247))
+
 ### v5.0.3
 
 This release does not yet fix Grafana 7 support (it's complicated...) but it fixes a few more bugs while

docs/antora.yml

@@ -1,5 +1,5 @@
 name: helm
-version: '5.0.4-SNAPSHOT'
+version: '6.0.0'
 title: HELM
 nav:
   - modules/ROOT/nav.adoc

docs/modules/installation/pages/requirements.adoc

@@ -3,7 +3,8 @@
 == Runtime Requirements
 
 * http://docs.grafana.org/installation[Grafana]
-{page-component-title} works with Grafana Server version *6.3 through 6.7*.
+{page-component-title} works with Grafana Server version *7.0* and up.
+It has been tested with Grafana versions up to 7.2 at the time of release.
 
 == Build Requirements
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "opennms-helm",
-  "version": "5.1.0-SNAPSHOT",
+  "version": "6.0.0",
   "description": "A PM/FM console for Grafana",
   "repository": {
     "type": "git",

package.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": "5.1.0-SNAPSHOT",
-    "updated": "2020-10-13"
+    "version": "6.0.0",
+    "updated": "2020-10-14"
   },
   "includes": [
     {"type": "panel", "name": "Alarm Table"},