Skip to content

Commit b47bda4

Browse files
authored
OPG-505: Update docs for OPG v12 (#1063)
* OPG-505: Update docs for OPG v12 * fixes * Update flow histogram docs
1 parent 4040c4b commit b47bda4

6 files changed

Lines changed: 38 additions & 11 deletions

File tree

docs/antora.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ asciidoc:
66
full-display-version: '12.0.0-SNAPSHOT'
77
grafana-version-required: '12.x'
88
grafana-version-tested: '12.0'
9-
node-js-build-version: '20.x'
9+
node-js-build-version: '22.x'
1010
product-name: 'OpenNMS Plugin for Grafana'
1111
nav:
1212
- modules/ROOT/nav.adoc

docs/modules/contributing/pages/developing.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ npm ci
4747
[source, shell]
4848
npm run dev
4949

50+
Note that `npm run dev` will generate (mostly) non-minified code which is better when debugging in a browser.
51+
For a release build, you can run `npm run build` to create minified and optimized code.
52+
5053
. Symlink your `dist` directory to Grafana's plugin path:
5154
+
5255
[source, shell]
-24.8 KB
Loading

docs/modules/installation/pages/requirements.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ You also need a http://docs.grafana.org/installation[Grafana instance] (version
1111

1212
NOTE: We have tested the plugin with Grafana version {grafana-version-tested}.
1313
It may work with older versions, but we have not tested them specifically.
14+
Most likely it will also work with Grafana 10 and 11.
1415
We recommend that you use matching versions of the plugin and Grafana (for example, {product-name} 9.x and Grafana 9.x).
1516

1617
The OpenNMS Grafana Dashboard Report feature requires the https://grafana.com/grafana/plugins/grafana-image-renderer/[Grafana Image Renderer plugin] to be installed.

docs/modules/installation/pages/upgrading.adoc

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,38 +56,42 @@ perl -pi -e 's/opennms-grafana-plugin-fault-datasource/opennms-grafana-plugin-en
5656
wizzy export datasources
5757

5858
[[upgrade-dashboards]]
59-
== Upgrade dashboards for version 9.x
59+
== Upgrade dashboards for version 9.x and 12.x
6060

61-
When you upgrade your {page-component-title} installation to version 9.x, you must upgrade any previously existing dashboards.
61+
When you upgrade your {page-component-title} installation to version 12.x, you should upgrade any previously existing dashboards.
62+
Dashboards that worked with {product-name} version 9 will most likely still work, but it is recommended that you upgrade them to version 12.x.
63+
64+
Dashboards used with {product-name} version 8 or earlier *will not* work with version 12 and must be upgraded.
6265
If they are not upgraded, they will not be displayed.
6366

64-
The {product-name} version 9.x includes a dashboard conversion tool to upgrade dashboards created using previous versions.
67+
The {product-name} version 12.x includes a dashboard conversion tool to upgrade dashboards created using previous versions.
6568

6669
IMPORTANT: You must export your dashboards from a previous version of the plugin.
6770
You can export them before you upgrade your {page-component-title} installation, or from a separate Grafana instance that is running the previous version.
6871

6972
When you export a dashboard, a JSON file is produced containing its settings and associated data.
7073

71-
After you export your old dashboards, upgrade your plugin to version 9.x.
74+
After you export your old dashboards, upgrade your plugin to version 12.x.
7275
Next, use the conversion tool to update your dashboards:
7376

74-
. xref:getting_started:basic_walkthrough.adoc#bw-dashboard-create[Create a new dashboard].
75-
. Click the *Add Panel* symbol.
76-
. Click *Add New Panel*.
77-
. Select the *Dashboard Convert* panel.
77+
. Go to *Dashboards*
78+
. Click on *Dashboard Converter | OpenNMS Plugin for Grafana* which is already installed with {product-name} version 12.
7879
. On the Dashboard Convert panel, select the version of the plugin from which you exported the dashboard using the *Source Plugin Version* list.
7980
+
8081
.Dashboard Convert panel
8182
image::dashboard-conversion-tool.png["Dashboard Convert panel displaying blank configuration options.", 650]
8283

83-
. Paste the contents of a dashboard JSON file in the *Enter Source Dashboard JSON* box.
84+
. Paste the contents of a dashboard JSON file in the *Enter Source Dashboard Json* box.
8485
The dashboard's name should appear in the *Dashboard Title* box.
8586
** (Optional) Edit the *Dashboard Title*.
8687
** (Optional) Toggle *Unhide All Queries* on or off, as desired.
8788
Toggling this on marks all OpenNMS datasource queries as visible, which may be useful for troubleshooting.
89+
** (Optional) Toggle *Convert Graph to Timeseries Panels* on or off, as desired.
90+
This will convert any of your Graph panels to the newer Grafana Timeseries Panels.
8891
. Click *Convert*.
8992
The converted JSON is displayed in the *Target Dashboard JSON* box.
9093
. Copy the converted JSON and use it to import a dashboard.
94+
Go to *Dashboards* > *New* > *Import* to import the converted JSON.
9195

9296
NOTE: The conversion tool may not handle all patterns in variables and resource names.
9397
After you convert your dashboards, test them to ensure that all of the associated data is correct.

docs/modules/panel_configuration/pages/index.adoc

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,23 @@ Follow these steps to customize an alarms table panel:
9595
. Set other display options as desired.
9696

9797
After the panel is configured, you can right-click on an entry to access the context menu.
98-
From there, you can access an alarm's *Details* and *Acknowledge*, *Escalate*, or *Clear* it:
98+
From there, you can access an alarm's *Details* and *Acknowledge*, *Escalate*, or *Clear* it.
99+
100+
You can hold down the *Shift* key and click on the table to select multiple rows to (for example) *Acknowledge* multiple alarms at once.
101+
102+
There are also two additional features in the *Panel options* section:
103+
104+
. *Use Grafana user.*
105+
Used to control whether operations on alarms are performed by the data source user, or the user that is currently logged in to Grafana.
106+
Supported operations are escalating, clearing, un-acknowledging alarms as well as creating/updating a journal/memo.
107+
*NOTE:* The data source must be configured using an user with the "admin" role in order to perform actions as other users.
108+
Default is off.
109+
110+
. *Display action notice.*
111+
Enables a notice to be displayed after performing an action such as acknowledge, clear or escalate
112+
which will notify the user whether the action succeeded and prompt them to refresh the panel.
113+
Default is on.
114+
99115

100116
image::alarms-table-example.png["Example of an alarms table panel in edit mode. Areas of note are outlined in red.", 850]
101117

@@ -119,6 +135,9 @@ NOTE: The query must include an `asTableSummary()` transform, otherwise the pane
119135
This sets the method by which data is grouped in the panel.
120136
*Stacked* displays cumulative data from all sources, grouped by incoming and outgoing data.
121137
** (Optional) Update the legend settings as desired.
138+
*** *Show Legend* shows or hides the legend
139+
*** *Position* positions the legend either on the *Right Side* (the default), or else *Under Graph*
140+
*** *Height* is the height in `px` of the legend, default is 42. You can increase this if not all legend items are showing, perhaps if there are over 10 items.
122141
. Set other display options as desired.
123142

124143
Using these settings, the flow histogram panel displays the following visualization:

0 commit comments

Comments
 (0)