Update NDB branch

.circleci/config.yml

@@ -1,134 +1,101 @@
 ---
 version: 2.1
-
+orbs:
+  prometheus: prometheus/prometheus@0.17.1
 executors:
-  # Whenever the Go version is updated here, .travis.yml and .promu.yml
+  # Whenever the Go version is updated here, .promu.yml
   # should also be updated.
   golang:
     docker:
-    - image: circleci/golang:1.12
-
+      - image: cimg/go:1.23
 jobs:
   test:
     executor: golang
-
     steps:
-    - checkout
-    - run: make promu
-    - run: make check_license style staticcheck unused build test-short
-    - run: git diff --exit-code
-    - store_artifacts:
-        path: mysqld_exporter
-        destination: /build/mysql_exporter
-    - run: rm -v mysqld_exporter
-
-  codespell:
+      - prometheus/setup_environment
+      - run: make check_license style staticcheck unused build test-short
+      - prometheus/store_artifact:
+          file: mysqld_exporter
+  integration:
     docker:
-    - image: circleci/python
-
+      - image: cimg/go:1.23
+      - image: << parameters.mysql_image >>
+        environment:
+          MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+          MYSQL_ROOT_HOST: '%'
+    parameters:
+      mysql_image:
+        type: string
     steps:
-    - checkout
-    - run: sudo pip install codespell
-    - run: codespell --skip=".git,./vendor,ttar,Makefile.common" -L uint,ist
-
-  build:
-    machine: true
-    working_directory: /home/circleci/.go_workspace/src/github.com/prometheus/mysqld_exporter
-
-    steps:
-    - checkout
-    - run: make promu
-    - run: promu crossbuild -v
-    - persist_to_workspace:
-        root: .
-        paths:
-        - .build
-    - store_artifacts:
-        path: .build
-        destination: /build
-
-  docker_hub_master:
-    executor: golang
-
-    steps:
-    - checkout
-    - setup_remote_docker
-    - attach_workspace:
-        at: .
-    - run: ln -s .build/linux-amd64/mysqld_exporter mysqld_exporter
-    - run: make docker
-    - run: make docker DOCKER_REPO=quay.io/prometheus
-    - run: docker images
-    - run: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-    - run: docker login -u $QUAY_LOGIN -p $QUAY_PASSWORD quay.io
-    - run: make docker-publish
-    - run: make docker-publish DOCKER_REPO=quay.io/prometheus
-
-  docker_hub_release_tags:
+      - checkout
+      - setup_remote_docker
+      - run: docker version
+      - run: docker-compose --version
+      - run: make build
+      - run: make test
+  mixin:
     executor: golang
-
-    environment:
-      DOCKER_IMAGE_NAME: prom/mysqld-exporter
-      QUAY_IMAGE_NAME: quay.io/prometheus/mysqld-exporter
-
     steps:
-    - checkout
-    - setup_remote_docker
-    - attach_workspace:
-        at: .
-    - run: make promu
-    - run: promu crossbuild tarballs
-    - run: promu checksum .tarballs
-    - run: promu release .tarballs
-    - store_artifacts:
-        path: .tarballs
-        destination: releases
-    - run: ln -s .build/linux-amd64/mysqld_exporter mysqld_exporter
-    - run: make docker DOCKER_IMAGE_TAG=$CIRCLE_TAG
-    - run: make docker DOCKER_IMAGE_TAG=$CIRCLE_TAG DOCKER_REPO=quay.io/prometheus
-    - run: docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-    - run: docker login -u $QUAY_LOGIN -p $QUAY_PASSWORD quay.io
-    - run: |
-        if [[ "$CIRCLE_TAG" =~ ^v[0-9]+(\.[0-9]+){2}$ ]]; then
-          make docker-tag-latest DOCKER_IMAGE_TAG="$CIRCLE_TAG"
-          make docker-tag-latest DOCKER_IMAGE_TAG="$CIRCLE_TAG" DOCKER_REPO=quay.io/prometheus
-          make docker-publish DOCKER_IMAGE_TAG="latest"
-          make docker-publish DOCKER_IMAGE_TAG="latest" DOCKER_REPO=quay.io/prometheus
-        fi
-    - run: make docker-publish DOCKER_IMAGE_TAG="$CIRCLE_TAG"
-    - run: make docker-publish DOCKER_REPO=quay.io/prometheus DOCKER_IMAGE_TAG="$CIRCLE_TAG"
-
+      - 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: /.*/
-    - build:
-        filters:
-          tags:
-            only: /.*/
-    - codespell:
-        filters:
-          tags:
-            only: /.*/
-    - docker_hub_master:
-        context: org-context
-        requires:
-        - test
-        - build
-        filters:
-          branches:
-            only: master
-    - docker_hub_release_tags:
-        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:
+                - percona:5.6
+                - mysql:5.7.33
+                - mysql:8.0
+                - mysql:8.4
+                - mariadb:10.5
+                - mariadb:10.6
+                - mariadb:10.11
+                - mariadb:11.4
+      - prometheus/build:
+          name: build
+          parallelism: 3
+          promu_opts: "-p linux/amd64 -p windows/amd64 -p linux/arm64 -p darwin/amd64 -p darwin/arm64 -p linux/386"
+          filters:
+            tags:
+              ignore: /^v.*/
+            branches:
+              ignore: /^(main|release-.*|.*build-all.*)$/
+      - prometheus/build:
+          name: build_all
+          parallelism: 12
+          filters:
+            branches:
+              only: /^(main|release-.*|.*build-all.*)$/
+            tags:
+              only: /^v.*/
+      - mixin:
+          filters:
+            tags:
+              only: /.*/
+      - prometheus/publish_main:
+          context: org-context
+          requires:
+            - test
+            - build_all
+          filters:
+            branches:
+              only: main
+      - prometheus/publish_release:
+          context: org-context
+          requires:
+            - test
+            - build_all
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore: /.*/

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/container_description.yml

@@ -0,0 +1,57 @@
+---
+name: Push README to Docker Hub
+on:
+  push:
+    paths:
+      - "README.md"
+      - "README-containers.md"
+      - ".github/workflows/container_description.yml"
+    branches: [ main, master ]
+
+permissions:
+  contents: read
+
+jobs:
+  PushDockerHubReadme:
+    runs-on: ubuntu-latest
+    name: Push README to Docker Hub
+    if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
+    steps:
+      - name: git checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Set docker hub repo name
+        run: echo "DOCKER_REPO_NAME=$(make docker-repo-name)" >> $GITHUB_ENV
+      - name: Push README to Dockerhub
+        uses: christian-korneck/update-container-description-action@d36005551adeaba9698d8d67a296bd16fa91f8e8 # v1
+        env:
+          DOCKER_USER: ${{ secrets.DOCKER_HUB_LOGIN }}
+          DOCKER_PASS: ${{ secrets.DOCKER_HUB_PASSWORD }}
+        with:
+          destination_container_repo: ${{ env.DOCKER_REPO_NAME }}
+          provider: dockerhub
+          short_description: ${{ env.DOCKER_REPO_NAME }}
+          # Empty string results in README-containers.md being pushed if it
+          # exists. Otherwise, README.md is pushed.
+          readme_file: ''
+
+  PushQuayIoReadme:
+    runs-on: ubuntu-latest
+    name: Push README to quay.io
+    if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
+    steps:
+      - name: git checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Set quay.io org name
+        run: echo "DOCKER_REPO=$(echo quay.io/${GITHUB_REPOSITORY_OWNER} | tr -d '-')" >> $GITHUB_ENV
+      - name: Set quay.io repo name
+        run: echo "DOCKER_REPO_NAME=$(make docker-repo-name)" >> $GITHUB_ENV
+      - name: Push README to quay.io
+        uses: christian-korneck/update-container-description-action@d36005551adeaba9698d8d67a296bd16fa91f8e8 # v1
+        env:
+          DOCKER_APIKEY: ${{ secrets.QUAY_IO_API_TOKEN }}
+        with:
+          destination_container_repo: ${{ env.DOCKER_REPO_NAME }}
+          provider: quay
+          # Empty string results in README-containers.md being pushed if it
+          # exists. Otherwise, README.md is pushed.
+          readme_file: ''

.github/workflows/golangci-lint.yml

@@ -0,0 +1,39 @@
+---
+# This action is synced from https://github.com/prometheus/prometheus
+name: golangci-lint
+on:
+  push:
+    paths:
+      - "go.sum"
+      - "go.mod"
+      - "**.go"
+      - "scripts/errcheck_excludes.txt"
+      - ".github/workflows/golangci-lint.yml"
+      - ".golangci.yml"
+  pull_request:
+
+permissions:  # added using https://github.com/step-security/secure-repo
+  contents: read
+
+jobs:
+  golangci:
+    permissions:
+      contents: read  # for actions/checkout to fetch code
+      pull-requests: read  # for golangci/golangci-lint-action to fetch pull requests
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Install Go
+        uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
+        with:
+          go-version: 1.24.x
+      - name: Install snmp_exporter/generator dependencies
+        run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
+        if: github.repository == 'prometheus/snmp_exporter'
+      - name: Lint
+        uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
+        with:
+          args: --verbose
+          version: v1.64.6

.gitignore

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

.golangci.yml

@@ -1,8 +1,8 @@
-run:
-  modules-download-mode: vendor
-
+---
 # Run only staticcheck for now. Additional linters will be enabled one-by-one.
 linters:
   enable:
-  - staticcheck
+    - misspell
+    - staticcheck
+    - sloglint
   disable-all: true

.promu.yml

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