Skip to content

Commit

Permalink
Merge pull request #1470 from lsst-it/IT-5028/rm-telegraf
Browse files Browse the repository at this point in the history
(*) rm telegraf; purge complete
  • Loading branch information
jhoblitt authored Sep 23, 2024
2 parents 4e1e62d + fa313bd commit b960d2a
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 27 deletions.
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ group :test do
gem 'librarian-puppet', require: false
gem 'puppet-lint-package_ensure-check', '~> 0.2.0', require: false
gem 'r10k', require: false
gem 'toml-rb', require: false # puppet/telegraf
end

group :development do
Expand Down
1 change: 0 additions & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ mod 'puppet/ssh_keygen', '6.0.0'
mod 'puppet/sssd', '1.0.0'
mod 'puppet/systemd', '7.1.0'
mod 'puppet/tang', '0.2.0'
mod 'puppet/telegraf', '5.4.0'
mod 'puppet/tuned', '1.0.0'
mod 'puppet/yum', '7.1.0'
mod 'richardc/datacat', '0.6.2'
Expand Down
3 changes: 0 additions & 3 deletions hieradata/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -442,9 +442,6 @@ sssd::package_name:
sssd::service_names:
- "sssd"

telegraf::ensure: "absent"
telegraf::purge_config_fragments: true

mit_krb5::includedir:
- "/etc/krb5.conf.d/"
- "/var/lib/sss/pubconf/krb5.include.d/"
Expand Down
2 changes: 0 additions & 2 deletions hieradata/node/allsky2-cam.cp.lsst.org.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions site/profile/manifests/core/common.pp
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
# @param manage_firewall
# Whether or not to include the firewall class
#
# @param install_telegraf
# If `true`, manage telegraf
#
# @param manage_scl
# If `true`, enable redhat scl repos
#
Expand All @@ -54,7 +51,6 @@
Boolean $manage_ipa = true,
Boolean $disable_ipv6 = false,
Boolean $manage_firewall = true,
Boolean $install_telegraf = true,
Boolean $manage_scl = true,
Boolean $manage_repos = true,
Boolean $manage_irqbalance = true,
Expand Down Expand Up @@ -129,10 +125,6 @@
include irqbalance
}

if $install_telegraf {
include telegraf
}

if $manage_node_exporter {
include prometheus::node_exporter
}
Expand Down
1 change: 0 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ def gen_net_facts
shared_examples 'common' do |os_facts:, site:, no_auth: false, chrony: true, node_exporter: true|
include_examples('bash_completion', os_facts:)
include_examples 'convenience'
include_examples 'telegraf'
include_examples('rsyslog defaults', site:)

unless no_auth
Expand Down
11 changes: 0 additions & 11 deletions spec/support/spec/telegraf.rb

This file was deleted.

0 comments on commit b960d2a

Please sign in to comment.