Merge pull request #5 from rtkwlf/update

[AWN-66436] Update our fork to upstream main

Author: rtkkroland

.circleci/config.yml

@@ -0,0 +1,52 @@
+---
+version: 2.1
+orbs:
+  prometheus: prometheus/prometheus@0.17.1
+executors:
+  # This must match .promu.yml.
+  golang:
+    docker:
+      - image: cimg/go:1.20
+jobs:
+  test:
+    executor: golang
+    steps:
+      - prometheus/setup_environment
+      - run: make
+      - prometheus/store_artifact:
+          file: elasticsearch_exporter
+workflows:
+  version: 2
+  elasticsearch_exporter:
+    jobs:
+      - test:
+          filters:
+            tags:
+              only: /.*/
+      - prometheus/build:
+          name: build
+          filters:
+            tags:
+              only: /.*/
+      - prometheus/publish_master:
+          context: org-context
+          docker_hub_organization: prometheuscommunity
+          quay_io_organization: prometheuscommunity
+          requires:
+            - test
+            - build
+          filters:
+            branches:
+              only: master
+      - prometheus/publish_release:
+          context: org-context
+          docker_hub_organization: prometheuscommunity
+          quay_io_organization: prometheuscommunity
+          requires:
+            - test
+            - build
+          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/golangci-lint.yml

@@ -0,0 +1,32 @@
+---
+# 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:
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - name: install Go
+        uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
+        with:
+          go-version: 1.20.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@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
+        with:
+          version: v1.54.2

.gitignore

@@ -3,3 +3,4 @@ elasticsearch_exporter
 *.tar.gz
 *-stamp
 .tarballs
+/vendor

.golangci.yml

@@ -0,0 +1,20 @@
+---
+linters:
+  enable:
+    - revive
+
+issues:
+  exclude-rules:
+    - path: _test.go
+      linters:
+        - errcheck
+
+linters-settings:
+  errcheck:
+    exclude: scripts/errcheck_excludes.txt
+  revive:
+    rules:
+      # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#unused-parameter
+      - name: unused-parameter
+        severity: warning
+        disabled: true

.gometalinter.json

@@ -1,8 +1,11 @@
 go:
-    cgo: false
+    # This must match .circle/config.yml.
+    version: 1.20
 repository:
-    path: github.com/justwatchcom/elasticsearch_exporter
+    path: github.com/prometheus-community/elasticsearch_exporter
 build:
+    binaries:
+        - name: elasticsearch_exporter
     flags: -a -tags netgo
     ldflags: |
         -s
@@ -19,27 +22,3 @@ tarball:
         - examples/grafana/dashboard.json
         - examples/kubernetes/deployment.yml
         - examples/prometheus/elasticsearch.rules
-crossbuild:
-    platforms:
-        - linux/amd64
-        - linux/386
-        - darwin/amd64
-        - darwin/386
-        - windows/amd64
-        - windows/386
-        - freebsd/amd64
-        - freebsd/386
-        - openbsd/amd64
-        - openbsd/386
-        - netbsd/amd64
-        - netbsd/386
-        - dragonfly/amd64
-        - linux/arm
-        - linux/arm64
-        - freebsd/arm
-        - openbsd/arm
-        - netbsd/arm
-        - linux/ppc64
-        - linux/ppc64le
-        - linux/mips64
-        - linux/mips64le

.promu.yml

@@ -0,0 +1,23 @@
+---
+extends: default
+
+rules:
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
+  commas: disable
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  indentation:
+    spaces: consistent
+    indent-sequences: consistent
+  key-duplicates:
+    ignore: |
+      config/testdata/section_key_dup.bad.yml
+  line-length: disable
+  truthy:
+    check-keys: false

.travis.yml

@@ -1,3 +1,65 @@
+## master / unreleased
+
+BREAKING CHANGES:
+
+The flag `--es.snapshots` has been renamed to `--collector.snapshots`.
+
+* [CHANGE] Rename --es.snapshots to --collector.snapshots #XXX
+
+## 1.6.0 / 2023-06-22
+
+BREAKING CHANGES:
+
+The flag `--es.cluster_settings` has been renamed to `--collector.clustersettings`.
+
+* [CHANGE] Rename --es.cluster_settings to --collector.clustersettings
+* [FEATURE] Add ILM metrics #513
+* [ENHANCEMENT] Add ElasticCloud node roles to role label #652
+* [ENHANCEMENT] Add ability to use AWS IAM role for authentication #653
+* [ENHANCEMENT] Add metric for index replica count #483
+* [BUGFIX] Set elasticsearch_clusterinfo_version_info guage to 1 #728
+* [BUGFIX] Fix index field counts with nested fields #675
+
+
+## 1.5.0 / 2022-07-28
+
+* [FEATURE] Add metrics collection for data stream statistics #592
+* [FEATURE] Support for AWS Elasticsearch using AWS SDK v2 #597
+* [BUGFIX] Fix cluster settings collection when max_shards_per_node is manually set. #603
+
+## 1.4.0 / 2022-06-29
+
+* [BREAKING] Remove ENV var support for most non-sensitive options. #518
+* [BREAKING] Rename elasticsearch_process_cpu_time_seconds_sum to elasticsearch_process_cpu_seconds_total #520
+* [FEATURE] Add metric for index aliases #563
+* [FEATURE] Add metric for number of shards on a node #535
+* [FEATURE] Add metrics for SLM (snapshot lifecycle management) #558
+* [FEATURE] Add metric for JVM uptime #537
+* [FEATURE] Add metrics for current searches and current indexing documents #485
+* [BUGFIX] Remove the elasticsearch_process_cpu_time_seconds_sum metric as it was never used #498
+
+## 1.3.0 / 2021-10-21
+
+* [FEATURE] Add support for passing elasticsearch credentials via the ES_USERNAME and ES_PASSWORD environment varialbes #461
+* [FEATURE] Add support for API keys for elasticsearch authentication (Elastic cloud) #459
+* [BUGFIX] Fix index stats when shards are unavailable #445
+
+## 1.2.1 / 2021-06-29
+
+* [BUGFIX] Fixed elasticsearch 7.13 node stats metrics #439
+* [BUGFIX] Fixed snapshot stats metrics for some snapshot repository types #442
+
+## 1.2.0 / 2021-06-10
+
+This release marks the first release under the prometheus-community organization.
+
+* [FEATURE] Added elasticsearch_clustersettings_stats_max_shards_per_node metric. #277
+* [FEATURE] Added elasticsearch_indices_shards_store_size_in_bytes metric. #292
+* [FEATURE] Added --es.indices_mappings flag to scrape elasticsearch index mapping stats and elasticsearch_indices_mappings_stats collector. #411
+* [FEATURE] Added elasticsearch_snapshot_stats_latest_snapshot_timestamp_seconds metric. #318
+* [ENHANCEMENT] Added support for reloading the tls client certificate in case it changes on disk. #414
+* [BUGFIX] Fixed the elasticsearch_indices_shards_docs metric name. #291
+
 ## 1.1.0
 
 repeating the breaking changes introduced in 1.1.0rc1:
@@ -39,10 +101,10 @@ build fix: remove unnecessary conversion
 * [FEATURE] new collector for cluster settings
 * [FEATURE] new collector for indices settings
 * [FEATURE] cluster info collector. The collector periodically queries the / endpoints and provides the other collectors with a semi up-to-date cluster label
-* 
+*
 * [FEATURE]/ [BUGFIX] grafana dashboard improvements and fixes
 * [BUGFIX] Fixed createTLSConfig function. Return full tls configuration when ca, crt, key and insecure flag are set
-* 
+*
 * [INTERNAL] added code linting to build pipeline
 
 ## 1.0.4rc1