Merge branch 'main' into pr/478

Author: SuperQ

.circleci/config.yml

@@ -1,97 +1,99 @@
 ---
 version: 2.1
-
 orbs:
-  prometheus: prometheus/[email protected]
-
+  prometheus: prometheus/[email protected]
 executors:
   # Whenever the Go version is updated here, .promu.yml
   # should also be updated.
   golang:
     docker:
-    - image: circleci/golang:1.14
-
+      - image: circleci/golang:1.17
 jobs:
   test:
     executor: golang
-
     steps:
-    - prometheus/setup_environment
-    - run: make check_license style staticcheck unused build test-short
-    - prometheus/store_artifact:
-        file: mysqld_exporter
-
+      - prometheus/setup_environment
+      - run: make check_license style staticcheck unused build test-short
+      - prometheus/store_artifact:
+          file: mysqld_exporter
   integration:
-    machine:
-      image: ubuntu-1604:202004-01
-
+    docker:
+      - image: circleci/golang:1.16
+      - image: << parameters.mysql_image >>
+        environment:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_ROOT_HOST: '%'
     parameters:
       mysql_image:
         type: string
-
     steps:
-    - checkout
-    - run: docker version
-    - run: docker-compose --version
-    - run: make build
-    - run:
-        name: Run integration test
-        command: |
-          MYSQL_IMAGE=<< parameters.mysql_image >> docker-compose up -d
-          make test
-
+      - checkout
+      - setup_remote_docker
+      - run: docker version
+      - run: docker-compose --version
+      - run: make build
+      - run: make test
   codespell:
     docker:
-    - image: circleci/python
-
+      - image: circleci/python
+    steps:
+      - checkout
+      - run: sudo pip install codespell
+      - run: codespell --skip=".git,./vendor,ttar,Makefile.common" -L uint,ist,keypair
+  mixin:
+    executor: golang
     steps:
-    - checkout
-    - run: sudo pip install codespell
-    - run: codespell --skip=".git,./vendor,ttar,Makefile.common" -L uint,ist,keypair
-
+      - checkout
+      - run: go install github.com/monitoring-mixins/mixtool/cmd/mixtool@latest
+      - run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
+      - run: make -C mysqld-mixin lint build
 workflows:
   version: 2
   mysqld_exporter:
     jobs:
-    - test:
-        filters:
-          tags:
-            only: /.*/
-    - integration:
-        matrix:
-          parameters:
-            mysql_image:
-            - mysql/mysql-server:5.6
-            - mysql/mysql-server:5.7
-            - mysql/mysql-server:8.0
-            - mariadb:10.1
-            - mariadb:10.2
-            - mariadb:10.3
-            - mariadb:10.4
-    - prometheus/build:
-        name: build
-        filters:
-          tags:
-            only: /.*/
-    - codespell:
-        filters:
-          tags:
-            only: /.*/
-    - prometheus/publish_master:
-        context: org-context
-        requires:
-        - test
-        - build
-        filters:
-          branches:
-            only: master
-    - prometheus/publish_release:
-        context: org-context
-        requires:
-        - test
-        - build
-        filters:
-          tags:
-            only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
-          branches:
-            ignore: /.*/
+      - test:
+          filters:
+            tags:
+              only: /.*/
+      - integration:
+          matrix:
+            parameters:
+              mysql_image:
+                - mysql/mysql-server:5.6
+                - mysql/mysql-server:5.7.33
+                - mysql/mysql-server:8.0
+                - mariadb:10.2
+                - mariadb:10.3
+                - mariadb:10.4
+                - mariadb:10.5
+      - prometheus/build:
+          name: build
+          filters:
+            tags:
+              only: /.*/
+      - codespell:
+          filters:
+            tags:
+              only: /.*/
+      - mixin:
+          filters:
+            tags:
+              only: /.*/
+      - prometheus/publish_main:
+          context: org-context
+          requires:
+            - test
+            - build
+          filters:
+            branches:
+              only: main
+      - prometheus/publish_release:
+          context: org-context
+          requires:
+            - test
+            - build
+          filters:
+            tags:
+              only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+            branches:
+              ignore: /.*/

.github/workflows/golangci-lint.yml

@@ -0,0 +1,31 @@
+name: golangci-lint
+on:
+  push:
+    paths:
+      - "go.sum"
+      - "go.mod"
+      - "**.go"
+      - "scripts/errcheck_excludes.txt"
+      - ".github/workflows/golangci-lint.yml"
+      - ".golangci.yml"
+  pull_request:
+    paths:
+      - "go.sum"
+      - "go.mod"
+      - "**.go"
+      - "scripts/errcheck_excludes.txt"
+      - ".github/workflows/golangci-lint.yml"
+      - ".golangci.yml"
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.42.0

.gitignore

@@ -8,3 +8,4 @@
 *-stamp
 .idea
 *.iml
+/vendor

.golangci.yml

@@ -1,6 +1,4 @@
-run:
-  modules-download-mode: vendor
-
+---
 # Run only staticcheck for now. Additional linters will be enabled one-by-one.
 linters:
   enable:

.promu.yml

@@ -1,11 +1,11 @@
 go:
     # Whenever the Go version is updated here, .circle/config.yml should also
     # be updated.
-    version: 1.14
+    version: 1.17
 repository:
     path: github.com/prometheus/mysqld_exporter
 build:
-    flags: -mod=vendor -a -tags netgo
+    flags: -a -tags netgo
     ldflags: |
         -X github.com/prometheus/common/version.Version={{.Version}}
         -X github.com/prometheus/common/version.Revision={{.Revision}}

CHANGELOG.md

@@ -1,26 +1,46 @@
 ## master / unreleased
 
-### BREAKING CHANGES:
+BREAKING CHANGES:
 
-### Changes:
+Changes:
 
 * [CHANGE]
-* [BUGFIX]
-* [ENHANCEMENT]
 * [FEATURE]
+* [ENHANCEMENT]
+* [BUGFIX]
 
-* [FEATURE] Add `tls.insecure-skip-verify` flag to ignore tls verification errors (PR #417) #348
-* [FEATURE] Add new metrics to `replication_group_member_stats` collector to support MySQL 8.x.
-* [FEATURE] Add collector for `replication_group_members` (PR #459) #362
-* [BUGFIX] Fixed output value of wsrep_cluster_status #473
+* [FEATURE] Add collector for `replica_host_status` #496
 
-### BREAKING CHANGES:
+## 0.13.0 / 2021-05-18
+
+BREAKING CHANGES:
 
 Changes related to `replication_group_member_stats` collector:
 * metric "transaction_in_queue" was Counter instead of Gauge
 * renamed 3 metrics starting with `mysql_perf_schema_transaction_` to start with `mysql_perf_schema_transactions_` to be consistent with column names
 * exposing only server's own stats by matching MEMBER_ID with @@server_uuid resulting "member_id" label to be dropped.
 
+Changes:
+
+* [CHANGE] Switch to go-kit for logs. #433
+* [FEATURE] Add `tls.insecure-skip-verify` flag to ignore tls verification errors #417
+* [FEATURE] Add collector for AWS Aurora information_schema.replica_host_status #435
+* [FEATURE] Add collector for `replication_group_members` #459
+* [FEATURE] Add new metrics to `replication_group_member_stats` collector to support MySQL 8.x. #462
+* [FEATURE] Add collector for `performance_schema.memory_summary_global_by_event_name` #515
+* [FEATURE] Support authenticating using mTLS client cert and no password #539
+* [FEATURE] Add TLS and basic authentication #522
+* [ENHANCEMENT] Support heartbeats in UTC #471
+* [ENHANCEMENT] Improve parsing of boolean strings #548
+* [BUGFIX] Fix binlog metrics on mysql 8.x #419
+* [BUGFIX] Fix output value of wsrep_cluster_status #473
+* [BUGFIX] Fix collect.info_schema.innodb_metrics for new field names (mariadb 10.5+) #494
+* [BUGFIX] Fix log output of collect[] params #505
+* [BUGFIX] Fix collect.info_schema.innodb_tablespaces for new table names #516
+* [BUGFIX] Fix innodb_metrics for mariadb 10.5+ #523
+* [BUGFIX] Allow perf_schema.memory summary current_bytes to be negative #517
+
+
 ## 0.12.1 / 2019-07-10
 
 ### Changes:

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+## Prometheus Community Code of Conduct
+
+Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

Dockerfile

@@ -1,12 +1,12 @@
 ARG ARCH="amd64"
 ARG OS="linux"
-FROM   quay.io/prometheus/busybox:latest
-LABEL  maintainer="The Prometheus Authors <[email protected]>"
+FROM quay.io/prometheus/busybox-${OS}-${ARCH}:latest
+LABEL maintainer="The Prometheus Authors <[email protected]>"
 
 ARG ARCH="amd64"
 ARG OS="linux"
 COPY .build/${OS}-${ARCH}/mysqld_exporter /bin/mysqld_exporter
 
-USER        nobody
 EXPOSE      9104
+USER        nobody
 ENTRYPOINT  [ "/bin/mysqld_exporter" ]

LICENSE

@@ -1,4 +1,4 @@
-Apache License
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -178,15 +178,15 @@ Apache License
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,4 +199,3 @@ Apache License
    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.
-