Merge pull request #4 from cloudlinux/upgrade-to-latest

CLPRO-2902: Sync node_exporter with upstream

All jenkins tests passed, build successfull. https://build.cloudlinux.com/#/build/692f3cb0d18740fa8c88571d
No problems found while manual testing

Author: clrkrompets

.circleci/config.yml

@@ -1,104 +1,139 @@
 ---
 version: 2.1
-
 orbs:
-  prometheus: prometheus/prometheus@0.4.0
-
+  prometheus: prometheus/prometheus@0.17.1
 executors:
   # Whenever the Go version is updated here, .promu.yml and .promu-cgo.yml
   # should also be updated.
   golang:
     docker:
-    - image: circleci/golang:1.14
+      - image: cimg/go:1.25
+  arm:
+    docker:
+      - image: cimg/go:1.25
+    resource_class: arm.medium
 
 jobs:
   test:
     executor: golang
-
     steps:
-    - prometheus/setup_environment
-    - run: make
-    - prometheus/store_artifact:
-        file: node_exporter
-
-  codespell:
-    docker:
-    - image: circleci/python
-
+      - prometheus/setup_environment
+      - run: go mod download
+      - run: make
+      - prometheus/store_artifact:
+          file: node_exporter
+  test-arm:
+    executor: arm
     steps:
-    - checkout
-    - run: sudo pip install codespell
-    - run: codespell --skip=".git,./vendor,ttar,go.mod,go.sum,*pem,./collector/fixtures" -L uint,packages\',uptodate
-
+      - prometheus/setup_environment
+      - run: uname -a
+      - run: make test-e2e
+  test_mixins:
+    executor: golang
+    steps:
+      - checkout
+      - run: go install github.com/google/go-jsonnet/cmd/jsonnet@latest
+      - run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
+      - run: go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@latest
+      - run: make promtool
+      - run: make -C docs/node-mixin clean
+      - run: make -C docs/node-mixin jb_install
+      - run: make -C docs/node-mixin
+      - run: git diff --exit-code
   build:
     machine:
-      image: ubuntu-1604:201903-01
+      image: ubuntu-2404:current
+    parallelism: 3
+    steps:
+      - prometheus/setup_environment
+      - run: docker run --privileged linuxkit/binfmt:af88a591f9cc896a52ce596b9cf7ca26a061ef97
+      - run: promu crossbuild -v --parallelism $CIRCLE_NODE_TOTAL --parallelism-thread $CIRCLE_NODE_INDEX
+      - run: promu --config .promu-cgo.yml crossbuild -v --parallelism $CIRCLE_NODE_TOTAL --parallelism-thread $CIRCLE_NODE_INDEX
+      # sign the darwin build so it doesn't get SIGKILLed on start, see: https://github.com/prometheus/node_exporter/issues/2539
+      - run:
+          command: |
+            if [[ -f "$(pwd)/.build/darwin-arm64/node_exporter" ]]; then
+                promu codesign "$(pwd)/.build/darwin-arm64/node_exporter"
+            fi
 
+            if [[ -f "$(pwd)/.build/darwin-amd64/node_exporter" ]]; then
+                promu codesign "$(pwd)/.build/darwin-amd64/node_exporter"                
+            fi
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .build
+      - store_artifacts:
+          path: .build
+          destination: /build
+  test_docker:
+    machine:
+      image: ubuntu-2404:current
     environment:
-      DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.14-base
+      DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.25-base
       REPO_PATH: github.com/prometheus/node_exporter
-
     steps:
-    - checkout
-    - run: docker run --privileged linuxkit/binfmt:v0.7
-    - run: make promu
-    - run: promu crossbuild
-    - run: promu --config .promu-cgo.yml crossbuild
-    - persist_to_workspace:
-        root: .
-        paths:
-        - .build
-    - store_artifacts:
-        path: .build
-        destination: /build
-    - run:
-        command: |
-          if [ -n "$CIRCLE_TAG" ]; then
-            make docker DOCKER_IMAGE_TAG=$CIRCLE_TAG
-          else
-            make docker
-          fi
-    - run: docker images
-    - run: docker run --rm -t -v "$(pwd):/app" "${DOCKER_TEST_IMAGE_NAME}" -i "${REPO_PATH}" -T
-    - run:
-        command: |
-          if [ -n "$CIRCLE_TAG" ]; then
-            make test-docker DOCKER_IMAGE_TAG=$CIRCLE_TAG
-          else
-            make test-docker
-          fi
-
+      - prometheus/setup_environment
+      - attach_workspace:
+          at: .
+      - run:
+          command: |
+            if [ -n "$CIRCLE_TAG" ]; then
+              make docker DOCKER_IMAGE_TAG=$CIRCLE_TAG
+            else
+              make docker
+            fi
+      - run: docker images
+      - run: docker run --rm -t -v "$(pwd):/app" "${DOCKER_TEST_IMAGE_NAME}" -i "${REPO_PATH}" -T
+      - run:
+          command: |
+            if [ -n "$CIRCLE_TAG" ]; then
+              make test-docker DOCKER_IMAGE_TAG=$CIRCLE_TAG
+            else
+              make test-docker
+            fi
 workflows:
   version: 2
   node_exporter:
     jobs:
-    - test:
-        filters:
-          tags:
-            only: /.*/
-    - 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.*/
-          branches:
-            ignore: /.*/
+      - test:
+          filters:
+            tags:
+              only: /.*/
+      - test-arm:
+          filters:
+            tags:
+              only: /.*/
+      - build:
+          filters:
+            tags:
+              only: /.*/
+      - test_docker:
+          requires:
+            - test
+            - build
+          filters:
+            tags:
+              only: /.*/
+      - test_mixins:
+          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.*/
+            branches:
+              ignore: /.*/

.github/ISSUE_TEMPLATE.md

@@ -1,14 +1,12 @@
 <!--
 	Please note: GitHub issues should only be used for feature requests and
-	bug reports. For general usage/help/discussions, please refer to one of:
-
-	- #prometheus on freenode
-	- the Prometheus Users list: https://groups.google.com/forum/#!forum/prometheus-users
+	bug reports. For general discussions, please refer to one of the community channels
+	described in https://prometheus.io/community/.
 
 	Before filing a bug report, note that running node_exporter in Docker is
 	not recommended, for the reasons detailed in the README:
 
-	https://github.com/prometheus/node_exporter#using-docker
+	https://github.com/prometheus/node_exporter#docker
 
 	Finally, also note that node_exporter is focused on *NIX kernels, and the
 	WMI exporter should be used instead on Windows.
@@ -25,6 +23,8 @@
 ### node_exporter command line flags
 <!-- Please list all of the command line flags -->
 
+### node_exporter log output
+
 ### Are you running node_exporter in Docker?
 <!-- Please note the warning above. -->
 

.github/dependabot.yml

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