X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/65525e02bed90b273b8515ba699cf80e997a5c3b..f8615415d66741ec7ad5aa2b9d23272f10e2b1a2:/cookbooks/mysql/recipes/default.rb

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index 2336bc1f7..baeff798e 100644
--- 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,31 +54,6 @@ template "/etc/apparmor.d/local/usr.sbin.mysqld" do
   only_if { ::Dir.exist?("/sys/kernel/security/apparmor") }
 end
 
-package "libdbd-mysql-perl"
-package "libcache-cache-perl"
-
-%w[
-  commands connections files handler_read handler_tmp handler_transaction
-  handler_write innodb_bpool innodb_bpool_act innodb_history_list_length
-  innodb_insert_buf innodb_io innodb_io_pend innodb_log innodb_queries
-  innodb_read_views innodb_rows innodb_semaphores innodb_srv_master_thread
-  innodb_tnx max_mem mrr myisam_indexes network_traffic performance
-  qcache qcache_mem select_types slow sorts table_definitions table_locks
-  tmp_tables
-].each do |stat|
-  munin_plugin "mysql_#{stat}" do
-    target "mysql_"
-  end
-end
-
-%w[
-  bin_relay_log files_tables replication
-].each do |stat|
-  munin_plugin "mysql_#{stat}" do
-    action :delete
-  end
-end
-
 mysql_password = persistent_token("mysql", "prometheus", "password")
 
 mysql_user "prometheus" do
@@ -90,5 +64,6 @@ end
 
 prometheus_exporter "mysqld" do
   port 9104
-  environment "DATA_SOURCE_NAME" => "prometheus:#{mysql_password}@(localhost:3306)/"
+  options "--mysqld.username=prometheus"
+  environment "MYSQLD_EXPORTER_PASSWORD" => mysql_password
 end