Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-9.x' into main-9
Browse files Browse the repository at this point in the history
  • Loading branch information
mershad-manesh committed May 28, 2024
2 parents 83b7773 + 2e0702b commit 29ccbca
Show file tree
Hide file tree
Showing 18 changed files with 1,960 additions and 1,258 deletions.
2 changes: 1 addition & 1 deletion .config/webpack/webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const config = async (env): Promise<Configuration> => ({
loader: 'swc-loader',
options: {
jsc: {
baseUrl: './src',
baseUrl: path.resolve(__dirname, './src'),
target: 'es2015',
loose: false,
parser: {
Expand Down
31 changes: 28 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,38 @@ updates:
target-branch: "release-9.x"
versioning-strategy: "increase-if-necessary"
reviewers:
- "rangerrick"
- "j-white"
- "OpenNMS/dependabot-reviewers-node"
labels:
- "dependabot"
commit-message:
prefix: "build"
include: "scope"
schedule:
interval: "daily"

groups:
babel-and-eslint:
patterns:
- "*babel*"
- "*eslint*"
update-types:
- "minor"
- "patch"
grafana:
patterns:
- "*grafana*"
update-types:
- "minor"
- "patch"
jest:
patterns:
- "*jest*"
update-types:
- "minor"
- "patch"
webpack:
patterns:
- "*webpack*"
- "*-loader"
update-types:
- "minor"
- "patch"
2 changes: 1 addition & 1 deletion docs/antora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '9'
title: Plugin for Grafana
asciidoc:
attributes:
full-display-version: '9.0.13'
full-display-version: '9.0.14-SNAPSHOT'
grafana-version-required: '9.x'
grafana-version-tested: '9.0'
node-js-build-version: '16.x'
Expand Down
13 changes: 13 additions & 0 deletions docs/modules/datasources/pages/performance_datasource.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -323,3 +323,16 @@ resourceToName($node, $interface) <1>

The `resourceToInterface()` function transforms a resource ID, or a combination of node criteria and a partial resource ID, into another value.
It is a special case of the other, more general methods; it takes the label of the resource (assumed to be an `interface-MAC` formatted string) and returns the interface portion of the label.

== Datasource configuration options

=== Enable Input Value Override Components

When configuring a Performance Query, you provide values for types, nodes, resources, attributes, etc.
Generally these are dropdown inputs with specific values, and may include template variables.
In some cases, the dropdowns have validation that will only accept the displayed predefined values or text entered in a particular format.
In these cases, it may be necessary or desirable to bypass these restrictions and enter a free-form text value or expression.

If "Enable Input Override Components" is enabled in the Performance Datasource configuration page, then some inputs will display a switch, which if enabled will display a text input box to allow you to manually enter any text for that value.

This is disabled by default as it is generally not needed.
Loading

0 comments on commit 29ccbca

Please sign in to comment.