From 10da0a723ea6e1746c6fbee0997e0af4496b8409 Mon Sep 17 00:00:00 2001 From: phil Date: Thu, 9 Jun 2022 13:38:00 +0200 Subject: [PATCH] mariadb: Aktiviere slowlog in der globalen Konfigurationsdatei --- defaults/main.yml | 3 --- handlers/main.yml | 2 +- tasks/main.yml | 3 +++ tasks/mariadb.yml | 6 ++++++ tasks/munin.yml | 19 ------------------- templates/90-sao.cnf.j2 | 11 +++++++++++ 6 files changed, 21 insertions(+), 23 deletions(-) create mode 100644 tasks/mariadb.yml create mode 100644 templates/90-sao.cnf.j2 diff --git a/defaults/main.yml b/defaults/main.yml index 89c2dc2..f5171bc 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,6 +4,3 @@ monit_sql_password: otV7krRQQJa7YIBoFZDLOTBibB3mfXLmwDTwITffiK munin_sql_config_file: /etc/munin/plugin-conf.d/zzz-mariadb munin_sql_user: munin munin_sql_password: za8x5sECY6pP2GWdR36UKYP7tHFodvRLyr6f5wAt7D - -mysql_server_config_file: /etc/mysql/mariadb.conf.d/50-server.cnf -mysql_socket: /run/mysqld/mysqld.sock diff --git a/handlers/main.yml b/handlers/main.yml index c9bab15..cca4624 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -4,7 +4,7 @@ name: munin-node state: restarted -- name: restart mysql +- name: restart mariadb service: name: mariadb state: restarted diff --git a/tasks/main.yml b/tasks/main.yml index 24bbe96..c6b0006 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,6 +2,9 @@ - import_tasks: packages.yml tags: packages +- import_tasks: mariadb.yml + tags: mariadb + - name: "Munin" include_tasks: munin.yml when: "'munin' in ansible_facts.packages" diff --git a/tasks/mariadb.yml b/tasks/mariadb.yml new file mode 100644 index 0000000..3ca2b37 --- /dev/null +++ b/tasks/mariadb.yml @@ -0,0 +1,6 @@ +--- +- name: "mariadb | Kopiere Serverkonfiguration" + template: + src: 90-sao.cnf.j2 + dest: /etc/mysql/mariadb.conf.d/90-sao.cnf + notify: restart mariadb diff --git a/tasks/munin.yml b/tasks/munin.yml index 586d009..caeae0a 100644 --- a/tasks/munin.yml +++ b/tasks/munin.yml @@ -20,22 +20,3 @@ # Ausgabe von fehlerhaften Plugins (exit 1) ignorieren ignore_errors: yes notify: restart munin-node - -- name: "Munin: Aktiviere slowlog" - lineinfile: - path: "{{ mysql_server_config_file }}" - insertafter: ^# Enable the slow query - line: 'slow_query_log = 1' - notify: restart mysql - -- name: "Munin: Konfiguriere slowlog" - lineinfile: - path: "{{ mysql_server_config_file }}" - regexp: "{{ item.regexp }}" - line: "{{ item.line }}" - with_items: - - { regexp: '^#slow_query_log_file', line: 'slow_query_log_file = /var/log/mysql/mariadb-slow.log' } - - { regexp: '^#long_query_time', line: 'long_query_time = 10' } - - { regexp: '^#log_slow_rate_limit', line: 'log_slow_rate_limit = 1000' } - - { regexp: '^#log_slow_verbosity', line: 'log_slow_verbosity = query_plan' } - notify: restart mysql diff --git a/templates/90-sao.cnf.j2 b/templates/90-sao.cnf.j2 new file mode 100644 index 0000000..937596b --- /dev/null +++ b/templates/90-sao.cnf.j2 @@ -0,0 +1,11 @@ +# {{ ansible_managed }} + +[mysqld] +bind_address={{ mariadb.bind_address|default("127.0.0.1") }} + +# Slow-Log +slow_query_log = 1 +slow_query_log_file = /var/log/mysql/mariadb-slow.log +long_query_time = 10 +log_slow_rate_limit = 1000 +log_slow_verbosity = query_plan