Scrub last munin traces

Signed-off-by: Grant Slater <github@firefishy.com>

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 234baa86c1a919e1306342fe42f501b16ec46547..df157c37741bf645ecea0777503ef8cfbf50331e 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -68,8 +68,6 @@ jobs:
           - mailman
           - matomo
           - memcached
-          - munin
-          - munin-plugins
           - mysql
           - networking
           - nginx

diff --git a/.kitchen.yml b/.kitchen.yml
index 80fe1b58b3194fbd5a09506ab1216fc347058271..f4a55180f8e23417fb6d1363531dbf8c5e240ded 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -250,12 +250,6 @@ suites:
   - name: memcached
     run_list:
       - recipe[memcached::default]
-  - name: munin
-    run_list:
-      - recipe[munin::default]
-  - name: munin-plugins
-    run_list:
-      - recipe[munin::plugins]
   - name: mysql
     run_list:
       - recipe[mysql::default]

diff --git a/cookbooks/apache/metadata.rb b/cookbooks/apache/metadata.rb
index f5c6057da6a8221408becd45c946c019e8a3b14b..2323547f7e3eb6a90bec66f403b5117dc24b80e9 100644 (file)
--- a/cookbooks/apache/metadata.rb
+++ b/cookbooks/apache/metadata.rb
@@ -7,7 +7,6 @@ description       "Installs and configures apache"
 version           "1.0.0"
 supports          "ubuntu"
 depends           "fail2ban"
-depends           "munin"
 depends           "prometheus"
 depends           "ssl"
 depends           "systemd"

diff --git a/cookbooks/apache/recipes/default.rb b/cookbooks/apache/recipes/default.rb
index a689fad9562097581e02cebd92cd2e4434c336f6..090fc770c26a140a5e7a98a987610476a9355023 100644 (file)
--- a/cookbooks/apache/recipes/default.rb
+++ b/cookbooks/apache/recipes/default.rb
@@ -18,7 +18,6 @@
 #
 
 include_recipe "fail2ban"
-include_recipe "munin"
 include_recipe "prometheus"
 include_recipe "ssl"
 

diff --git a/cookbooks/backup/templates/default/expire.cron.erb b/cookbooks/backup/templates/default/expire.cron.erb
index c43c6f917919fce2bde5cbc94953a63ed6559caf..e1ec74a08a36aec5305ef367324d17cc4bf326d6 100644 (file)
--- a/cookbooks/backup/templates/default/expire.cron.erb
+++ b/cookbooks/backup/templates/default/expire.cron.erb
@@ -2,7 +2,7 @@
 
 # DO NOT EDIT - This file is being maintained by Chef
 
-for prefix in blogs chef-server chef-repository chef-git community forum git lists munin osm-blog osmf-crm osmf-ledgersmb wiki-wiki.osmfoundation.org osqa otrs prometheus sotm svn switch2osm trac wiki-board.osmfoundation.org wiki-dwg.osmfoundation.org wiki-mwg.osmfoundation.org wiki-wiki.openstreetmap.org
+for prefix in blogs chef-server chef-repository chef-git community forum git lists osm-blog osmf-crm osmf-ledgersmb wiki-wiki.osmfoundation.org osqa otrs prometheus sotm svn switch2osm trac wiki-board.osmfoundation.org wiki-dwg.osmfoundation.org wiki-mwg.osmfoundation.org wiki-wiki.openstreetmap.org
 do
   /usr/local/bin/expire-backups --days=3 --weeks=3 --months=3 /store/backup $prefix
 done

diff --git a/cookbooks/chef/metadata.rb b/cookbooks/chef/metadata.rb
index 569c8701c328ca72cb21267495e1752e0c590701..b2572c50d54453a88dcaf5b495f61eb3a8c23027 100644 (file)
--- a/cookbooks/chef/metadata.rb
+++ b/cookbooks/chef/metadata.rb
@@ -10,6 +10,5 @@ depends           "apache"
 depends           "apt"
 depends           "git"
 depends           "ohai"
-depends           "munin"
 depends           "systemd"
 gem               "mail", "= 2.7.1"

diff --git a/cookbooks/chef/recipes/server.rb b/cookbooks/chef/recipes/server.rb
index 31b6b196abb49e23e5a484709fefad373fbe561e..93e9363dc8e60859d570027b2744802881450160 100644 (file)
--- a/cookbooks/chef/recipes/server.rb
+++ b/cookbooks/chef/recipes/server.rb
@@ -19,7 +19,6 @@
 
 include_recipe "apache"
 include_recipe "chef::knife"
-include_recipe "munin"
 
 # cache_dir = Chef::Config[:file_cache_path]
 #

diff --git a/cookbooks/db/recipes/master.rb b/cookbooks/db/recipes/master.rb
index 7d6643dd1c9f8244a5eca65c33e8f347a3064dc1..c2d1da0247dbe65bf12fe79276530a9cd756cc04 100644 (file)
--- a/cookbooks/db/recipes/master.rb
+++ b/cookbooks/db/recipes/master.rb
@@ -62,11 +62,6 @@ postgresql_user "backup" do
   password passwords["backup"]
 end
 
-postgresql_user "munin" do
-  cluster node[:db][:cluster]
-  action :drop
-end
-
 postgresql_user "replication" do
   cluster node[:db][:cluster]
   password passwords["replication"]

diff --git a/cookbooks/dev/metadata.rb b/cookbooks/dev/metadata.rb
index 29e665a43dc0934fc0b1bcbb23d75f7436489cff..f84941d94ca0b1fc12a69bff6a00b112c98d2d68 100644 (file)
--- a/cookbooks/dev/metadata.rb
+++ b/cookbooks/dev/metadata.rb
@@ -12,7 +12,6 @@ depends           "chef"
 depends           "geoipupdate"
 depends           "git"
 depends           "memcached"
-depends           "munin"
 depends           "mysql"
 depends           "nodejs"
 depends           "php"

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index ebb90accfe858ca6cf6d94bdda700c623d242880..137db62cc0ccdedcb44c518df244d5874ef5e985 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -25,7 +25,6 @@ include_recipe "passenger"
 include_recipe "geoipupdate"
 include_recipe "git"
 include_recipe "memcached"
-include_recipe "munin"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "php::fpm"

diff --git a/cookbooks/exim/metadata.rb b/cookbooks/exim/metadata.rb
index cd9da2c453c5459e25d63507affc55ab69014b12..89611b11a248bb3300436ee097285b12114de86a 100644 (file)
--- a/cookbooks/exim/metadata.rb
+++ b/cookbooks/exim/metadata.rb
@@ -8,7 +8,6 @@ version           "1.0.0"
 supports          "ubuntu"
 depends           "accounts"
 depends           "apache"
-depends           "munin"
 depends           "networking"
 depends           "prometheus"
 depends           "ssl"

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 00c3be082c78446c153503a5b4f6e92de6b634dc..6ac19107f1d8a11ba7bd1dbe17f78c8e478b9353 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-include_recipe "munin"
 include_recipe "networking"
 include_recipe "prometheus"
 

diff --git a/cookbooks/fail2ban/metadata.rb b/cookbooks/fail2ban/metadata.rb
index 13cc6607face3c5757db9508b3eb1664fc0c5c1f..8a1dfe995913542e4fbf03f5e7d64c862f34ea89 100644 (file)
--- a/cookbooks/fail2ban/metadata.rb
+++ b/cookbooks/fail2ban/metadata.rb
@@ -6,5 +6,4 @@ description       "Configures fail2ban"
 
 version           "1.0.0"
 supports          "ubuntu"
-depends           "munin"
 depends           "prometheus"

diff --git a/cookbooks/fail2ban/recipes/default.rb b/cookbooks/fail2ban/recipes/default.rb
index ca0a419c37d29338304951a44c32dcbbb34c7547..216572989067f79898af72f859da3b28462a1284 100644 (file)
--- a/cookbooks/fail2ban/recipes/default.rb
+++ b/cookbooks/fail2ban/recipes/default.rb
@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-include_recipe "munin"
 include_recipe "prometheus"
 
 package %w[

diff --git a/cookbooks/hardware/metadata.rb b/cookbooks/hardware/metadata.rb
index 35dd20ed892a9a55a7e223493ec07e752bfe0203..de57c77ebdee5f664603d04a2cf918d7ec4f8775 100644 (file)
--- a/cookbooks/hardware/metadata.rb
+++ b/cookbooks/hardware/metadata.rb
@@ -9,7 +9,6 @@ supports          "ubuntu"
 depends           "apt"
 depends           "chef"
 depends           "git"
-depends           "munin"
 depends           "prometheus"
 depends           "ohai"
 depends           "tools"

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index fa6cb6cc80b3d7afe2b44e0029ace99eba6462b3..4122a7ac8e5172d25855e369dc17abb0d111e880 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -19,7 +19,6 @@
 
 include_recipe "apt"
 include_recipe "git"
-include_recipe "munin"
 include_recipe "prometheus"
 include_recipe "sysfs"
 include_recipe "tools"

diff --git a/cookbooks/memcached/metadata.rb b/cookbooks/memcached/metadata.rb
index f07fa1cdce47f4fc73bb7af4e6e3b95ddd825b9d..c5cee82b25c52e676e7debf18b9a167b145e2d98 100644 (file)
--- a/cookbooks/memcached/metadata.rb
+++ b/cookbooks/memcached/metadata.rb
@@ -6,5 +6,4 @@ description       "Installs and configures memcached"
 
 version           "1.0.0"
 supports          "ubuntu"
-depends           "munin"
 depends           "prometheus"

diff --git a/cookbooks/memcached/recipes/default.rb b/cookbooks/memcached/recipes/default.rb
index b178016ad1eab0636ed0c2b2343bb1c3da85a455..a4a1462d3f9c99f95374a685c6b0e79ae61874c9 100644 (file)
--- a/cookbooks/memcached/recipes/default.rb
+++ b/cookbooks/memcached/recipes/default.rb
@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-include_recipe "munin"
 include_recipe "prometheus"
 
 package "memcached"

diff --git a/cookbooks/munin/README.md b/cookbooks/munin/README.md
deleted file mode 100644 (file)
index 42ea706..0000000
--- a/cookbooks/munin/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Munin Cookbook
-
-This cookbook configures munin, which we use for server monitoring at
-[munin.openstreetmap.org](https://munin.openstreetmap.org). The cookbook
-contains two recipes:
-
-* default - installs and configures munin-node on each machine.
-* server - configures the central munin server
-
-Additionally two providers are defined - munin_plugin and munin_plugin_conf, for
-configuring individual munin plugins.

diff --git a/cookbooks/munin/attributes/default.rb b/cookbooks/munin/attributes/default.rb
deleted file mode 100644 (file)
index a1eb792..0000000
--- a/cookbooks/munin/attributes/default.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-default[:munin][:allow] = []
-default[:munin][:graphs] = {}
-default[:munin][:plugins] = {}

diff --git a/cookbooks/munin/libraries/expand.rb b/cookbooks/munin/libraries/expand.rb
deleted file mode 100644 (file)
index 248c5ad..0000000
--- a/cookbooks/munin/libraries/expand.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class Chef
-  class Munin
-    def self.expand(template, nodes, separator = " ")
-      nodes.map do |node|
-        if node.is_a?(Hash)
-          template
-            .gsub(/%%%([^%]+)%%%/) { node[Regexp.last_match[1].to_sym].tr("-", "_") }
-            .gsub(/%%([^%]+)%%/) { node[Regexp.last_match[1].to_sym] }
-        else
-          template
-            .gsub("%%%", node.tr("-", "_"))
-            .gsub("%%", node)
-        end
-      end.join(separator)
-    end
-  end
-end

diff --git a/cookbooks/munin/metadata.rb b/cookbooks/munin/metadata.rb
deleted file mode 100644 (file)
index 98b0747..0000000
--- a/cookbooks/munin/metadata.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-name              "munin"
-maintainer        "OpenStreetMap Administrators"
-maintainer_email  "admins@openstreetmap.org"
-license           "Apache-2.0"
-description       "Installs and configures munin"
-
-version           "1.0.0"
-supports          "ubuntu"
-depends           "networking"

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
deleted file mode 100644 (file)
index 3bbc4c4..0000000
--- a/cookbooks/munin/recipes/default.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Cookbook:: munin
-# Recipe:: default
-#
-# Copyright:: 2010, OpenStreetMap Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-service "munin-node" do
-  action [:stop, :disable]
-end
-
-file "/etc/munin/munin-node.conf" do
-  action :delete
-end
-
-package "munin-node" do
-  action :purge
-end
-
-directory "/etc/munin" do
-  action :delete
-  recursive true
-end

diff --git a/cookbooks/munin/recipes/plugins.rb b/cookbooks/munin/recipes/plugins.rb
deleted file mode 100644 (file)
index 3a4e7eb..0000000
--- a/cookbooks/munin/recipes/plugins.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Cookbook:: munin
-# Recipe:: default
-#
-# Copyright:: 2010, OpenStreetMap Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include_recipe "munin"
-
-directory "/etc/munin/plugins" do
-  action :delete
-  recursive true
-end
-
-directory "/usr/local/share/munin/plugins" do
-  action :delete
-  recursive true
-end
-
-directory "/etc/munin/plugin-conf.d" do
-  action :delete
-  recursive true
-end

diff --git a/cookbooks/mysql/metadata.rb b/cookbooks/mysql/metadata.rb
index 4f94d6099054ac24e890392ace88f89cdb53229f..bf6f4683319f030be1f67965255eaff01852ea96 100644 (file)
--- a/cookbooks/mysql/metadata.rb
+++ b/cookbooks/mysql/metadata.rb
@@ -7,5 +7,4 @@ description       "Installs and configures mysql"
 version           "1.0.0"
 supports          "ubuntu"
 depends           "chef"
-depends           "munin"
 depends           "prometheus"

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index b38a6364baa257878fd5d952bce22f2fc449582a..baeff798e8327d72f41d8ad0250a72ac20d1db1c 100644 (file)
--- a/cookbooks/mysql/recipes/default.rb
+++ b/cookbooks/mysql/recipes/default.rb
@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-include_recipe "munin"
 include_recipe "prometheus"
 
 mysql_variant = if platform?("ubuntu")
@@ -55,15 +54,6 @@ template "/etc/apparmor.d/local/usr.sbin.mysqld" do
   only_if { ::Dir.exist?("/sys/kernel/security/apparmor") }
 end
 
-# FIXME: Remove purge post munin removal
-package "libdbd-mysql-perl" do
-  action :purge
-end
-
-package "libcache-cache-perl" do
-  action :purge
-end
-
 mysql_password = persistent_token("mysql", "prometheus", "password")
 
 mysql_user "prometheus" do

diff --git a/cookbooks/nginx/metadata.rb b/cookbooks/nginx/metadata.rb
index 6534c587e4d846780a147354f5acb632d2f1fb99..b7e571c7c6411dacbf507e9eda1fd40728df0f3f 100644 (file)
--- a/cookbooks/nginx/metadata.rb
+++ b/cookbooks/nginx/metadata.rb
@@ -7,7 +7,6 @@ description       "Installs and configures nginx"
 version           "1.0.0"
 supports          "ubuntu"
 depends           "apt"
-depends           "munin"
 depends           "networking"
 depends           "prometheus"
 depends           "ssl"

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index bc763760966b5d3d06df8af339ed19770ed8acb3..d8e9d4d2bc566abd1d184c5aaacabf4cc643d4bc 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -18,7 +18,6 @@
 #
 
 include_recipe "apt::nginx"
-include_recipe "munin"
 include_recipe "prometheus"
 include_recipe "ssl"
 
@@ -53,11 +52,6 @@ service "nginx" do
   subscribes :restart, "template[/etc/nginx/nginx.conf]"
 end
 
-# FIXME: Remove purge post munin removal
-package "libwww-perl" do
-  action :purge
-end
-
 prometheus_exporter "nginx" do
   port 9113
   options "--nginx.scrape-uri=http://localhost:8050/nginx_status"

diff --git a/cookbooks/nominatim/metadata.rb b/cookbooks/nominatim/metadata.rb
index 3c8903ef39c2b467fa634b20986203eaa53461c2..ade7ed0b2d12f1fc60e717bd20cc09896ace52c4 100644 (file)
--- a/cookbooks/nominatim/metadata.rb
+++ b/cookbooks/nominatim/metadata.rb
@@ -9,7 +9,6 @@ supports          "ubuntu"
 depends           "accounts"
 depends           "fail2ban"
 depends           "git"
-depends           "munin"
 depends           "nginx"
 depends           "php"
 depends           "postgresql"

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 14b2b6628d854f30f3146144898a506c190a0011..2fc9191a6031d52985470dae5ca919f96569c9db 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -18,7 +18,6 @@
 #
 
 include_recipe "accounts"
-include_recipe "munin"
 include_recipe "prometheus"
 
 if node[:nominatim][:api_flavour] == "php"

diff --git a/cookbooks/ntp/metadata.rb b/cookbooks/ntp/metadata.rb
index 240e619f95ef960836e64dbbec11a06936e602fa..b512bb56a70d69557c888af542a1dce8b4ca338f 100644 (file)
--- a/cookbooks/ntp/metadata.rb
+++ b/cookbooks/ntp/metadata.rb
@@ -6,6 +6,5 @@ description       "Installs and configures ntp as a client or server"
 
 version           "0.8.2"
 supports          "ubuntu"
-depends           "munin"
 depends           "prometheus"
 depends           "systemd"

diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb
index 1b131f8f8fa26eb8b2ca74d438ecebc3735636eb..1f9579644b89b2237657fdf8ff9608c5a015a4dd 100644 (file)
--- a/cookbooks/ntp/recipes/default.rb
+++ b/cookbooks/ntp/recipes/default.rb
@@ -17,8 +17,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include_recipe "munin"
-
 package %w[
   chrony
   tzdata

diff --git a/cookbooks/overpass/metadata.rb b/cookbooks/overpass/metadata.rb
index 3f2aa322c325ae1d9c65720bbcf7c2713847147d..10f4d1b497558dd8551acac8a94e822c2f5c0b51 100644 (file)
--- a/cookbooks/overpass/metadata.rb
+++ b/cookbooks/overpass/metadata.rb
@@ -8,7 +8,6 @@ version           "1.0.0"
 supports          "ubuntu"
 depends           "accounts"
 depends           "apache"
-depends           "munin"
 depends           "prometheus"
 depends           "ruby"
 depends           "systemd"

diff --git a/cookbooks/overpass/recipes/default.rb b/cookbooks/overpass/recipes/default.rb
index 47469716875a78bbdfb801df44f002addb2959ea..0cad2a1ab44280c464f45378b136d3070c0952f5 100644 (file)
--- a/cookbooks/overpass/recipes/default.rb
+++ b/cookbooks/overpass/recipes/default.rb
@@ -19,7 +19,6 @@
 
 include_recipe "accounts"
 include_recipe "apache"
-include_recipe "munin"
 include_recipe "prometheus"
 include_recipe "ruby"
 
@@ -36,12 +35,6 @@ web_passwords = data_bag_item("web", "passwords")
   end
 end
 
-# FIXME: Remove purge post munin removal
-directory "#{basedir}/munin" do
-  action :delete
-  recursive true
-end
-
 ## Install overpass from source
 
 srcdir = "#{basedir}/src/osm-3s_v#{node[:overpass][:version]}"

diff --git a/cookbooks/passenger/metadata.rb b/cookbooks/passenger/metadata.rb
index 8cbf75fa632e040e69d331a1b8f5507e0ddaedb1..26f48544f26fa03e05afab5c85cfd5d4694a8a29 100644 (file)
--- a/cookbooks/passenger/metadata.rb
+++ b/cookbooks/passenger/metadata.rb
@@ -8,7 +8,6 @@ version           "1.0.0"
 supports          "ubuntu"
 depends           "apache"
 depends           "apt"
-depends           "munin"
 depends           "prometheus"
 depends           "ruby"
 depends           "systemd"

diff --git a/cookbooks/passenger/recipes/default.rb b/cookbooks/passenger/recipes/default.rb
index 04e85b486493a3ac5039af867ce5f558545a5fe5..4ad7f8b0ecb8c65152abdf1970aefbeb58879950 100644 (file)
--- a/cookbooks/passenger/recipes/default.rb
+++ b/cookbooks/passenger/recipes/default.rb
@@ -19,7 +19,6 @@
 
 include_recipe "apache"
 include_recipe "apt::passenger"
-include_recipe "munin"
 include_recipe "prometheus"
 include_recipe "ruby"
 

diff --git a/cookbooks/planet/metadata.rb b/cookbooks/planet/metadata.rb
index a3e976976026aeb1b62048ef17bd359f0342e5e8..2e70109ee362bbb4ad33b93b78c46911baec272f 100644 (file)
--- a/cookbooks/planet/metadata.rb
+++ b/cookbooks/planet/metadata.rb
@@ -12,7 +12,6 @@ depends           "apt"
 depends           "awscli"
 depends           "geoipupdate"
 depends           "git"
-depends           "munin"
 depends           "ruby"
 depends           "osmosis"
 depends           "systemd"

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 519f58a52036f790e69e0981b5cba942eedc97fd..ad532f93e40eb49cdcce73323508924054ebf53d 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -21,7 +21,6 @@ include_recipe "accounts"
 include_recipe "apache"
 include_recipe "geoipupdate"
 include_recipe "planet::aws"
-include_recipe "munin"
 
 package %w[
   python3

diff --git a/cookbooks/postgresql/metadata.rb b/cookbooks/postgresql/metadata.rb
index a145daf0e1794c967b9f236f25cc213153bf422f..909b123dfae77c680aa41cf809670223bc02af10 100644 (file)
--- a/cookbooks/postgresql/metadata.rb
+++ b/cookbooks/postgresql/metadata.rb
@@ -7,6 +7,5 @@ description       "Installs and configures postgresql"
 version           "1.0.0"
 supports          "ubuntu"
 depends           "apt"
-depends           "munin"
 depends           "ohai"
 depends           "prometheus"

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index c34b4b0131e3194892929307a527706f7a9d99e2..eae492f16c99cf4f49a5ca1a9a966c6631dbd841 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -18,7 +18,6 @@
 #
 
 include_recipe "apt::postgresql"
-include_recipe "munin"
 include_recipe "prometheus"
 
 package "locales-all"

diff --git a/cookbooks/tile/metadata.rb b/cookbooks/tile/metadata.rb
index b07aad4f226f63abf842f02217e874e5e681a264..eaf2843fd81e17da2c1e1731d3997ae4a4bcfcc3 100644 (file)
--- a/cookbooks/tile/metadata.rb
+++ b/cookbooks/tile/metadata.rb
@@ -9,7 +9,6 @@ supports          "ubuntu"
 depends           "accounts"
 depends           "apache"
 depends           "git"
-depends           "munin"
 depends           "nodejs"
 depends           "postgresql"
 depends           "prometheus"

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index bd660f34294bbcdf56d29bbe1ee25171b908667a..0c9da1339385d5476eca1a746ce95d2fb92ac0a5 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -20,7 +20,6 @@
 include_recipe "accounts"
 include_recipe "apache"
 include_recipe "git"
-include_recipe "munin"
 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "prometheus"

diff --git a/cookbooks/web/metadata.rb b/cookbooks/web/metadata.rb
index a0e3e87791a3f314a5d58aa16951e6193f689cf1..004e5f320f4d1beddafe81b5c5ce1b2d2ee44814 100644 (file)
--- a/cookbooks/web/metadata.rb
+++ b/cookbooks/web/metadata.rb
@@ -14,7 +14,6 @@ depends           "fail2ban"
 depends           "geoipupdate"
 depends           "git"
 depends           "memcached"
-depends           "munin"
 depends           "nodejs"
 depends           "passenger"
 depends           "ruby"

diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index ddaecdffbd489519710d4b84d8ea2a0aab991f43..1f3236caa8da777b22e98d602bf6889d2a97d599 100644 (file)
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -21,7 +21,6 @@ include_recipe "apache"
 include_recipe "apt"
 include_recipe "git"
 include_recipe "geoipupdate"
-include_recipe "munin"
 include_recipe "nodejs"
 include_recipe "passenger"
 include_recipe "ruby"

diff --git a/roles/base.rb b/roles/base.rb
index faa580d9aeec8541f8012c127fd0ed65fefe0bb5..718b288a5a5b530bab46d60228dcb45506902b00 100644 (file)
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -88,7 +88,6 @@ run_list(
   "recipe[devices]",
   "recipe[hardware]",
   "recipe[prometheus]",
-  "recipe[munin::plugins]",
   "recipe[networking]",
   "recipe[exim]",
   "recipe[ntp]",

diff --git a/test/integration/munin/inspec/munin_node_spec.rb b/test/integration/munin/inspec/munin_node_spec.rb
deleted file mode 100644 (file)
index 023bd96..0000000
--- a/test/integration/munin/inspec/munin_node_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-describe package("munin-node") do
-  it { should_not be_installed }
-end
-
-describe service("munin-node") do
-  it { should_not be_enabled }
-  it { should_not be_running }
-end
-
-describe port(4949) do
-  it { should_not be_listening }
-end