Update mysqld_exporter properties

Author: frodenas

jobs/mysqld_exporter/spec

@@ -20,8 +20,18 @@ properties:
     description: "Collect from SHOW GLOBAL STATUS"
   mysqld_exporter.collect.global_variables:
     description: "Collect from SHOW GLOBAL VARIABLES"
+  mysqld_exporter.collect.heartbeat:
+    description: "Collect from heartbeat"
+  mysqld_exporter.collect.heartbeat_database:
+    description: "Database from where to collect heartbeat data"
+  mysqld_exporter.collect.heartbeat_table:
+    description: "Table from where to collect heartbeat data"
   mysqld_exporter.collect.info_schema.clientstats:
     description: "If running with userstat=1, set to true to collect client statistics"
+  mysqld_exporter.collect.info_schema.innodb_cmp:
+    description: "Collect metrics from information_schema.innodb_cmp"
+  mysqld_exporter.collect.info_schema.innodb_cmpmem:
+    description: "Collect metrics from information_schema.innodb_cmpmem"
   mysqld_exporter.collect.info_schema.innodb_metrics:
     description: "Collect metrics from information_schema.innodb_metrics"
   mysqld_exporter.collect.info_schema.innodb_tablespaces:
@@ -52,22 +62,34 @@ properties:
     description: "Collect metrics from performance_schema.events_waits_summary_global_by_event_name"
   mysqld_exporter.collect.perf_schema.file_events:
     description: "Collect metrics from performance_schema.file_summary_by_event_name"
+  mysqld_exporter.collect.perf_schema.file_instances:
+    description: "Collect metrics from performance_schema.file_summary_by_instance"
+  mysqld_exporter.collect.perf_schema.file_instances_filter:
+    description: "RegEx file_name filter for performance_schema.file_summary_by_instance"
+  mysqld_exporter.collect.perf_schema.file_instances_remove_prefix:
+    description: "Remove path prefix in performance_schema.file_summary_by_instance"
   mysqld_exporter.collect.perf_schema.indexiowaits:
     description: "Collect metrics from performance_schema.table_io_waits_summary_by_index_usage"
+  mysqld_exporter.collect.perf_schema.replication_group_member_stats:
+    description: "Collect metrics from performance_schema.replication_group_member_stats"
   mysqld_exporter.collect.perf_schema.tableiowaits:
     description: "Collect metrics from performance_schema.table_io_waits_summary_by_table"
   mysqld_exporter.collect.perf_schema.tablelocks:
     description: "Collect metrics from performance_schema.table_lock_waits_summary_by_table"
   mysqld_exporter.collect.slave_status:
    description: "Collect from SHOW SLAVE STATUS"
+  mysqld_exporter.collect.slave_hosts:
+    description: "Scrape information from 'SHOW SLAVE HOSTS'"
   mysqld_exporter.my_cnf:
-    description: "Path to .my.cnf file to read MySQL credentials from (default '/root/.my.cnf')"
+    description: "Path to .my.cnf file to read MySQL credentials from"
+  mysqld_exporter.lock_wait_timeout:
+    description: "Set a lock_wait_timeout on the connection to avoid long metadata locking"
   mysqld_exporter.log_format:
-    description: "If set use a syslog logger or JSON logging"
+    description: "Set the log target and format"
   mysqld_exporter.log_level:
     description: "Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]"
   mysqld_exporter.log_slow_filter:
-    description: "Add a log_slow_filter to avoid exessive MySQL slow logging"
+    description: "Add a log_slow_filter to avoid slow query logging of scrapes. NOTE: Not supported by Oracle MySQL"
   mysqld_exporter.web.port:
     description: "Port on which to expose web interface and telemetry"
     default: "9104"

jobs/mysqld_exporter/templates/bin/mysqld_exporter_ctl

@@ -29,98 +29,131 @@ case $1 in
 
     exec mysqld_exporter \
       <% if_p('mysqld_exporter.collect.auto_increment_columns') do |auto_increment_columns| %> \
-      -collect.auto_increment.columns="<%= auto_increment_columns %>" \
+      --collect.auto_increment.columns="<%= auto_increment_columns %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.binlog_size') do |binlog_size| %> \
-      -collect.binlog_size="<%= binlog_size %>" \
+      --collect.binlog_size="<%= binlog_size %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.engine_innodb_status') do |engine_innodb_status| %> \
-      -collect.engine_innodb_status="<%= engine_innodb_status %>" \
+      --collect.engine_innodb_status="<%= engine_innodb_status %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.engine_tokudb_status') do |engine_tokudb_status| %> \
-      -collect.engine_tokudb_status="<%= engine_tokudb_status %>" \
+      --collect.engine_tokudb_status="<%= engine_tokudb_status %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.global_status') do |global_status| %> \
-      -collect.global_status="<%= global_status %>" \
+      --collect.global_status="<%= global_status %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.global_variables') do |global_variables| %> \
-      -collect.global_variables="<%= global_variables %>" \
+      --collect.global_variables="<%= global_variables %>" \
+      <% end %> \
+      <% if_p('mysqld_exporter.collect.heartbeat') do |heartbeat| %> \
+      --collect.heartbeat="<%= heartbeat %>" \
+      <% end %> \
+      <% if_p('mysqld_exporter.collect.heartbeat_database') do |database| %> \
+      --collect.heartbeat.database="<%= database %>" \
+      <% end %> \
+      <% if_p('mysqld_exporter.collect.heartbeat_table') do |table| %> \
+      --collect.heartbeat.table="<%= table %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.info_schema.clientstats') do |clientstats| %> \
-      -collect.info_schema.clientstats="<%= clientstats %>" \
+      --collect.info_schema.clientstats="<%= clientstats %>" \
+      <% end %> \
+      <% if_p('mysqld_exporter.collect.info_schema.innodb_cmp') do |innodb_cmp| %> \
+      --collect.info_schema.innodb_cmp="<%= innodb_cmp %>" \
+      <% end %> \
+      <% if_p('mysqld_exporter.collect.info_schema.innodb_cmpmem') do |innodb_cmpmem| %> \
+      --collect.info_schema.innodb_cmpmem="<%= innodb_cmpmem %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.info_schema.innodb_metrics') do |innodb_metrics| %> \
-      -collect.info_schema.innodb_metrics="<%= innodb_metrics %>" \
+      --collect.info_schema.innodb_metrics="<%= innodb_metrics %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.info_schema.innodb_tablespaces') do |innodb_tablespaces| %> \
-      -collect.info_schema.innodb_tablespaces="<%= innodb_tablespaces %>" \
+      --collect.info_schema.innodb_tablespaces="<%= innodb_tablespaces %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.info_schema.processlist') do |processlist| %> \
-      -collect.info_schema.processlist="<%= processlist %>" \
+      --collect.info_schema.processlist="<%= processlist %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.info_schema.processlist_min_time') do |processlist_min_time| %> \
-      -collect.info_schema.processlist.min_time="<%= processlist_min_time %>" \
+      --collect.info_schema.processlist.min_time="<%= processlist_min_time %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.info_schema.query_response_time') do |query_response_time| %> \
-      -collect.info_schema.query_response_time="<%= query_response_time %>" \
+      --collect.info_schema.query_response_time="<%= query_response_time %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.info_schema.tables') do |tables| %> \
-      -collect.info_schema.tables="<%= tables %>" \
+      --collect.info_schema.tables="<%= tables %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.info_schema.tables_databases') do |tables_databases| %> \
-      -collect.info_schema.tables.databases="<%= tables_databases %>" \
+      --collect.info_schema.tables.databases="<%= tables_databases %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.info_schema.tablestats') do |tablestats| %> \
-      -collect.info_schema.tablestats="<%= tablestats %>" \
+      --collect.info_schema.tablestats="<%= tablestats %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.info_schema.userstats') do |userstats| %> \
-      -collect.info_schema.userstats="<%= userstats %>" \
+      --collect.info_schema.userstats="<%= userstats %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.perf_schema.eventsstatements') do |eventsstatements| %> \
-      -collect.perf_schema.eventsstatements="<%= eventsstatements %>" \
+      --collect.perf_schema.eventsstatements="<%= eventsstatements %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.perf_schema.eventsstatements_digest_text_limit') do |eventsstatements_digest_text_limit| %> \
-      -collect.perf_schema.eventsstatements.digest_text_limit="<%= eventsstatements_digest_text_limit %>" \
+      --collect.perf_schema.eventsstatements.digest_text_limit="<%= eventsstatements_digest_text_limit %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.perf_schema.eventsstatements_limit') do |eventsstatements_limit| %> \
-      -collect.perf_schema.eventsstatements.limit="<%= eventsstatements_limit %>" \
+      --collect.perf_schema.eventsstatements.limit="<%= eventsstatements_limit %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.perf_schema.eventsstatements_timelimit') do |eventsstatements_timelimit| %> \
-      -collect.perf_schema.eventsstatements.timelimit="<%= eventsstatements_timelimit %>" \
+      --collect.perf_schema.eventsstatements.timelimit="<%= eventsstatements_timelimit %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.perf_schema.eventswaits') do |eventswaits| %> \
-      -collect.perf_schema.eventswaits="<%= eventswaits %>" \
+      --collect.perf_schema.eventswaits="<%= eventswaits %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.perf_schema.file_events') do |file_events| %> \
-      -collect.perf_schema.file_events="<%= file_events %>" \
+      --collect.perf_schema.file_events="<%= file_events %>" \
+      <% end %> \
+      <% if_p('mysqld_exporter.collect.perf_schema.file_instances') do |file_instances| %> \
+      --collect.perf_schema.file_instances="<%= file_instances %>" \
+      <% end %> \
+      <% if_p('mysqld_exporter.collect.perf_schema.file_instances.filter') do |filter| %> \
+      --collect.perf_schema.file_instances_filter="<%= filter %>" \
+      <% end %> \
+      <% if_p('mysqld_exporter.collect.perf_schema.file_instances.remove_prefix') do |remove_prefix| %> \
+      --collect.perf_schema.file_instances_remove_prefix="<%= remove_prefix %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.perf_schema.indexiowaits') do |indexiowaits| %> \
-      -collect.perf_schema.indexiowaits="<%= indexiowaits %>" \
+      --collect.perf_schema.indexiowaits="<%= indexiowaits %>" \
+      <% end %> \
+      <% if_p('mysqld_exporter.collect.perf_schema.replication_group_member_stats') do |replication_group_member_stats| %> \
+      --collect.perf_schema.replication_group_member_stats="<%= replication_group_member_stats %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.perf_schema.tableiowaits') do |tableiowaits| %> \
-      -collect.perf_schema.tableiowaits="<%= tableiowaits %>" \
+      --collect.perf_schema.tableiowaits="<%= tableiowaits %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.perf_schema.tablelocks') do |tablelocks| %> \
-      -collect.perf_schema.tablelocks="<%= tablelocks %>" \
+      --collect.perf_schema.tablelocks="<%= tablelocks %>" \
       <% end %> \
       <% if_p('mysqld_exporter.collect.slave_status') do |slave_status| %> \
-      -collect.slave_status="<%= slave_status %>" \
+      --collect.slave_status="<%= slave_status %>" \
+      <% end %> \
+      <% if_p('mysqld_exporter.collect.slave_hosts') do |slave_hosts| %> \
+      --collect.slave_hosts="<%= slave_hosts %>" \
       <% end %> \
       <% if_p('mysqld_exporter.my_cnf') do |my_cnf| %> \
-      -config.my-cnf="<%= my_cnf %>" \
+      --config.my-cnf="<%= my_cnf %>" \
       <% end %> \
       <% if_p('mysqld_exporter.log_format') do |log_format| %> \
-      -log.format="<%= log_format %>" \
+      --log.format="<%= log_format %>" \
       <% end %> \
       <% if_p('mysqld_exporter.log_level') do |log_level| %> \
-      -log.level="<%= log_level %>" \
+      --log.level="<%= log_level %>" \
+      <% end %> \
+      <% if_p('mysqld_exporter.lock_wait_timeout') do |lock_wait_timeout| %> \
+      --exporter.lock_wait_timeout="<%= lock_wait_timeout %>" \
       <% end %> \
       <% if_p('mysqld_exporter.log_slow_filter') do |log_slow_filter| %> \
-      -log_slow_filter="<%= log_slow_filter %>" \
+      --exporter.log_slow_filter="<%= log_slow_filter %>" \
       <% end %> \
-      -web.listen-address=":<%= p('mysqld_exporter.web.port') %>" \
+      --web.listen-address=":<%= p('mysqld_exporter.web.port') %>" \
       <% if_p('mysqld_exporter.web.telemetry_path') do |telemetry_path| %> \
-      -web.telemetry-path="<%= telemetry_path %>" \
+      --web.telemetry-path="<%= telemetry_path %>" \
       <% end %> \
       >>  ${LOG_DIR}/mysqld_exporter.stdout.log \
       2>> ${LOG_DIR}/mysqld_exporter.stderr.log