Skip to content

Commit 13a704e

Browse files
committed
SVCPLAN-9262: Remove ncsa inventory script
1 parent 95e263b commit 13a704e

3 files changed

Lines changed: 8 additions & 77 deletions

File tree

data/common.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ profile_monitoring::telegraf::inputs_extra:
4444
data_format: "influx"
4545
interval: "1m"
4646
timeout: "30s"
47-
ncsa_inventory:
48-
command: "/etc/telegraf/scripts/ncsa_inventory.sh"
49-
data_format: "influx"
50-
interval: "168h"
51-
timeout: "5m"
5247
profile_monitoring::telegraf::inputs_extra_scripts:
5348
"/etc/telegraf/scripts/mount-state.sh":
5449
content: |
@@ -82,8 +77,6 @@ profile_monitoring::telegraf::inputs_extra_scripts:
8277
done
8378
echo "mount-state,nodeName=$host,mount=$target,source=$src mountState=1"
8479
done <<< "$ro_mounts"
85-
"/etc/telegraf/scripts/ncsa_inventory.sh":
86-
source: "puppet:///modules/profile_monitoring/misc/ncsa_inventory.sh"
8780
profile_monitoring::telegraf::ipmi_sensor_plugin_enabled: true
8881
profile_monitoring::telegraf::ipmi_sensor_telegraf_plugin_options:
8982
path: "/usr/bin/ipmitool"

files/misc/ncsa_inventory.sh

Lines changed: 0 additions & 70 deletions
This file was deleted.

manifests/telegraf.pp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,14 @@
228228
# Ensure the resources
229229
ensure_resources( 'file', $inputs_extra_scripts, $inputs_extra_scripts_defaults )
230230

231+
# SVCPLAN-9262: Cleanup retired ncsa_inventory conf & script (ignore when migrating to ansible)
232+
file { '/etc/telegraf/scripts/ncsa_inventory.sh':
233+
ensure => absent,
234+
}
235+
file { '/etc/telegraf/telegraf.d/ncsa_inventory.conf':
236+
ensure => absent,
237+
}
238+
231239
# Install outputs
232240
$outputs.each | $plugin_type, $entry | {
233241
$entry.each | $entry_name, $options | {

0 commit comments

Comments
 (0)