Skip to content

Commit b960d2a

Browse files
authored
Merge pull request #1470 from lsst-it/IT-5028/rm-telegraf
(*) rm telegraf; purge complete
2 parents 4e1e62d + fa313bd commit b960d2a

File tree

7 files changed

+0
-27
lines changed

7 files changed

+0
-27
lines changed

Gemfile

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ group :test do
1111
gem 'librarian-puppet', require: false
1212
gem 'puppet-lint-package_ensure-check', '~> 0.2.0', require: false
1313
gem 'r10k', require: false
14-
gem 'toml-rb', require: false # puppet/telegraf
1514
end
1615

1716
group :development do

Puppetfile

-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ mod 'puppet/ssh_keygen', '6.0.0'
9696
mod 'puppet/sssd', '1.0.0'
9797
mod 'puppet/systemd', '7.1.0'
9898
mod 'puppet/tang', '0.2.0'
99-
mod 'puppet/telegraf', '5.4.0'
10099
mod 'puppet/tuned', '1.0.0'
101100
mod 'puppet/yum', '7.1.0'
102101
mod 'richardc/datacat', '0.6.2'

hieradata/common.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,6 @@ sssd::package_name:
442442
sssd::service_names:
443443
- "sssd"
444444

445-
telegraf::ensure: "absent"
446-
telegraf::purge_config_fragments: true
447-
448445
mit_krb5::includedir:
449446
- "/etc/krb5.conf.d/"
450447
- "/var/lib/sss/pubconf/krb5.include.d/"

hieradata/node/allsky2-cam.cp.lsst.org.yaml

-2
This file was deleted.

site/profile/manifests/core/common.pp

-8
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
# @param manage_firewall
2626
# Whether or not to include the firewall class
2727
#
28-
# @param install_telegraf
29-
# If `true`, manage telegraf
30-
#
3128
# @param manage_scl
3229
# If `true`, enable redhat scl repos
3330
#
@@ -54,7 +51,6 @@
5451
Boolean $manage_ipa = true,
5552
Boolean $disable_ipv6 = false,
5653
Boolean $manage_firewall = true,
57-
Boolean $install_telegraf = true,
5854
Boolean $manage_scl = true,
5955
Boolean $manage_repos = true,
6056
Boolean $manage_irqbalance = true,
@@ -129,10 +125,6 @@
129125
include irqbalance
130126
}
131127

132-
if $install_telegraf {
133-
include telegraf
134-
}
135-
136128
if $manage_node_exporter {
137129
include prometheus::node_exporter
138130
}

spec/spec_helper.rb

-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ def gen_net_facts
174174
shared_examples 'common' do |os_facts:, site:, no_auth: false, chrony: true, node_exporter: true|
175175
include_examples('bash_completion', os_facts:)
176176
include_examples 'convenience'
177-
include_examples 'telegraf'
178177
include_examples('rsyslog defaults', site:)
179178

180179
unless no_auth

spec/support/spec/telegraf.rb

-11
This file was deleted.

0 commit comments

Comments
 (0)