From 9a6be10a49e0055db4399bcab8d9d2453247495a Mon Sep 17 00:00:00 2001 From: Lucia Brammer Date: Wed, 17 Jan 2024 10:55:38 -0800 Subject: [PATCH 1/4] feat: Update primary install to be framework config install --- .../network-data-ingest-and-cardinality/config.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data-sources/network-data-ingest-and-cardinality/config.yml b/data-sources/network-data-ingest-and-cardinality/config.yml index 52ea98642b..327eda787d 100644 --- a/data-sources/network-data-ingest-and-cardinality/config.yml +++ b/data-sources/network-data-ingest-and-cardinality/config.yml @@ -4,9 +4,11 @@ description: | The Network Data Ingest and Cardinality datasource provides a dashboard with several pages dedicated to analyzing both overall ingest and cardinality of telemetry from Network Performance Monitoring. icon: logo.svg install: - primary: - link: - url: https://docs.newrelic.com/docs/network-performance-monitoring/get-started/npm-introduction/ + nerdlet: + nerdletId: marketplace.install-data-source + nerdletState: + dataSourceId: snmp + requiresAccount: false keywords: - newrelic partner - npm From 8225e6af7e549ccee44f5b2a9962b1b18830e277 Mon Sep 17 00:00:00 2001 From: Lucia Brammer Date: Thu, 1 Feb 2024 10:59:50 -0800 Subject: [PATCH 2/4] fix: Update alertPolicies field to be correct --- quickstarts/hardware-sentry/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quickstarts/hardware-sentry/config.yml b/quickstarts/hardware-sentry/config.yml index 1c6e8ab9f6..72452b4799 100644 --- a/quickstarts/hardware-sentry/config.yml +++ b/quickstarts/hardware-sentry/config.yml @@ -6,7 +6,7 @@ description: | Hardware Sentry is Sentry Software's native OpenTelemetry solution which monitors the hardware health of almost any server, storage system, and network switch available on the market and exposes the collected metrics into New Relic. The solution also reports on power consumption, electricity costs and CO₂ emissions of on-prem IT infrastructures. The solution is free-to-use for New Relic users. [Support plans](https://sentrysoftware.com/pricing/) are available. - + ## About this integration This integration with New Relic & Hardware Sentry connects the native OpenTelemetry collector in Hardware Sentry's agent to New Relic's observability monitoring platform. @@ -36,11 +36,11 @@ dataSourceIds: - hardware-sentry dashboards: - hardware-sentry -alert-policies: +alertPolicies: - hardware-sentry documentation: - name: Hardware Sentry - New Relic integration url: https://www.sentrysoftware.com/docs/hws-doc/latest/integration/newrelic.html description: This documentation explains how to integrate Hardware Sentry with New Relic. icon: logo.png -website: https://www.sentrysoftware.com/ \ No newline at end of file +website: https://www.sentrysoftware.com/ From b9e11c78182ef28cc07dd56ea4987f066e30c2f4 Mon Sep 17 00:00:00 2001 From: Lucia Brammer Date: Thu, 1 Feb 2024 11:01:33 -0800 Subject: [PATCH 3/4] Revert "feat: Update primary install to be framework config install" This reverts commit 9a6be10a49e0055db4399bcab8d9d2453247495a. --- .../network-data-ingest-and-cardinality/config.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/data-sources/network-data-ingest-and-cardinality/config.yml b/data-sources/network-data-ingest-and-cardinality/config.yml index 327eda787d..52ea98642b 100644 --- a/data-sources/network-data-ingest-and-cardinality/config.yml +++ b/data-sources/network-data-ingest-and-cardinality/config.yml @@ -4,11 +4,9 @@ description: | The Network Data Ingest and Cardinality datasource provides a dashboard with several pages dedicated to analyzing both overall ingest and cardinality of telemetry from Network Performance Monitoring. icon: logo.svg install: - nerdlet: - nerdletId: marketplace.install-data-source - nerdletState: - dataSourceId: snmp - requiresAccount: false + primary: + link: + url: https://docs.newrelic.com/docs/network-performance-monitoring/get-started/npm-introduction/ keywords: - newrelic partner - npm From 15d4a991b200dce56dc9594b6c6925341b1097da Mon Sep 17 00:00:00 2001 From: Lucia Brammer Date: Thu, 1 Feb 2024 11:06:35 -0800 Subject: [PATCH 4/4] chore: Add valueFunction to alert policies --- alert-policies/hardware-sentry/battery-charge.yml | 5 ++++- alert-policies/hardware-sentry/connector-status.yml | 5 ++++- alert-policies/hardware-sentry/device-status(crit).yml | 5 ++++- alert-policies/hardware-sentry/device-status(warn).yml | 5 ++++- alert-policies/hardware-sentry/host-nonresponsive.yml | 5 ++++- alert-policies/hardware-sentry/missing-devices.yml | 5 ++++- alert-policies/hardware-sentry/physical-disk-cap.yml | 5 ++++- 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/alert-policies/hardware-sentry/battery-charge.yml b/alert-policies/hardware-sentry/battery-charge.yml index 5b65ead5f7..57dad06111 100644 --- a/alert-policies/hardware-sentry/battery-charge.yml +++ b/alert-policies/hardware-sentry/battery-charge.yml @@ -7,6 +7,9 @@ type: STATIC nrql: query: "FROM Metric SELECT latest(hw.battery.charge) FACET site, host.name" +# Function used to aggregate the NRQL query value(s) for comparison to the terms.threshold (Default: SINGLE_VALUE) +valueFunction: SINGLE_VALUE + # List of Critical and Warning thresholds for the condition terms: - priority: CRITICAL @@ -26,4 +29,4 @@ terms: # Time in seconds; 120 - 3600 thresholdDuration: 300 # How many data points must be in violation for the duration - thresholdOccurrences: ALL \ No newline at end of file + thresholdOccurrences: ALL diff --git a/alert-policies/hardware-sentry/connector-status.yml b/alert-policies/hardware-sentry/connector-status.yml index 5d172e0336..ddb595eb62 100644 --- a/alert-policies/hardware-sentry/connector-status.yml +++ b/alert-policies/hardware-sentry/connector-status.yml @@ -6,6 +6,9 @@ type: STATIC nrql: query: "FROM Metric SELECT latest(hardware_sentry.connector.status) WHERE state = 'degraded' FACET site, host.name" +# Function used to aggregate the NRQL query value(s) for comparison to the terms.threshold (Default: SINGLE_VALUE) +valueFunction: SINGLE_VALUE + # List of Critical and Warning thresholds for the condition terms: - priority: CRITICAL @@ -16,4 +19,4 @@ terms: # Time in seconds; 120 - 3600 thresholdDuration: 300 # How many data points must be in violation for the duration - thresholdOccurrences: ALL \ No newline at end of file + thresholdOccurrences: ALL diff --git a/alert-policies/hardware-sentry/device-status(crit).yml b/alert-policies/hardware-sentry/device-status(crit).yml index b474852610..ffd57f0058 100644 --- a/alert-policies/hardware-sentry/device-status(crit).yml +++ b/alert-policies/hardware-sentry/device-status(crit).yml @@ -7,6 +7,9 @@ type: STATIC nrql: query: "FROM Metric SELECT latest(hw.status) WHERE state IN ('failed') OR battery.state = 'failed' FACET site, host.name" +# Function used to aggregate the NRQL query value(s) for comparison to the terms.threshold (Default: SINGLE_VALUE) +valueFunction: SINGLE_VALUE + # List of Critical and Warning thresholds for the condition terms: - priority: CRITICAL @@ -17,4 +20,4 @@ terms: # Time in seconds; 120 - 3600 thresholdDuration: 300 # How many data points must be in violation for the duration - thresholdOccurrences: ALL \ No newline at end of file + thresholdOccurrences: ALL diff --git a/alert-policies/hardware-sentry/device-status(warn).yml b/alert-policies/hardware-sentry/device-status(warn).yml index 211486a10e..4d657f71e5 100644 --- a/alert-policies/hardware-sentry/device-status(warn).yml +++ b/alert-policies/hardware-sentry/device-status(warn).yml @@ -7,6 +7,9 @@ type: STATIC nrql: query: "FROM Metric SELECT latest(hw.battery.charge) FACET site, host.name" +# Function used to aggregate the NRQL query value(s) for comparison to the terms.threshold (Default: SINGLE_VALUE) +valueFunction: SINGLE_VALUE + # List of Critical and Warning thresholds for the condition terms: - priority: WARNING @@ -17,4 +20,4 @@ terms: # Time in seconds; 120 - 3600 thresholdDuration: 300 # How many data points must be in violation for the duration - thresholdOccurrences: ALL \ No newline at end of file + thresholdOccurrences: ALL diff --git a/alert-policies/hardware-sentry/host-nonresponsive.yml b/alert-policies/hardware-sentry/host-nonresponsive.yml index aefd5d7a18..3cd074ee0a 100644 --- a/alert-policies/hardware-sentry/host-nonresponsive.yml +++ b/alert-policies/hardware-sentry/host-nonresponsive.yml @@ -6,6 +6,9 @@ type: STATIC nrql: query: "SELECT latest(hardware_sentry.host.up) FROM Metric FACET host.id" +# Function used to aggregate the NRQL query value(s) for comparison to the terms.threshold (Default: SINGLE_VALUE) +valueFunction: SINGLE_VALUE + # List of Critical and Warning thresholds for the condition terms: - priority: CRITICAL @@ -16,4 +19,4 @@ terms: # Time in seconds; 120 - 3600 thresholdDuration: 300 # How many data points must be in violation for the duration - thresholdOccurrences: ALL \ No newline at end of file + thresholdOccurrences: ALL diff --git a/alert-policies/hardware-sentry/missing-devices.yml b/alert-policies/hardware-sentry/missing-devices.yml index ae0f0918f4..d54c215e41 100644 --- a/alert-policies/hardware-sentry/missing-devices.yml +++ b/alert-policies/hardware-sentry/missing-devices.yml @@ -6,6 +6,9 @@ type: STATIC nrql: query: "SELECT latest(hw.status) FROM Metric WHERE state = 'present' FACET host.name" +# Function used to aggregate the NRQL query value(s) for comparison to the terms.threshold (Default: SINGLE_VALUE) +valueFunction: SINGLE_VALUE + # List of Critical and Warning thresholds for the condition terms: - priority: CRITICAL @@ -16,4 +19,4 @@ terms: # Time in seconds; 120 - 3600 thresholdDuration: 300 # How many data points must be in violation for the duration - thresholdOccurrences: ALL \ No newline at end of file + thresholdOccurrences: ALL diff --git a/alert-policies/hardware-sentry/physical-disk-cap.yml b/alert-policies/hardware-sentry/physical-disk-cap.yml index 05355cf458..945600a749 100644 --- a/alert-policies/hardware-sentry/physical-disk-cap.yml +++ b/alert-policies/hardware-sentry/physical-disk-cap.yml @@ -6,6 +6,9 @@ type: STATIC nrql: query: "SELECT latest(hw.physical_disk.endurance_utilization) FROM Metric FACET host.id" +# Function used to aggregate the NRQL query value(s) for comparison to the terms.threshold (Default: SINGLE_VALUE) +valueFunction: SINGLE_VALUE + # List of Critical and Warning thresholds for the condition terms: - priority: CRITICAL @@ -25,4 +28,4 @@ terms: # Time in seconds; 120 - 3600 thresholdDuration: 300 # How many data points must be in violation for the duration - thresholdOccurrences: ALL \ No newline at end of file + thresholdOccurrences: ALL