build(deps): bump github.com/stretchr/testify from 1.7.2 to 1.8.1 in /documentation/examples/remote_storage

.circleci/config.yml

@@ -38,6 +38,7 @@ jobs:
             GO111MODULE: "on"
       - run: go test ./tsdb/ -test.tsdb-isolation=false
       - run: make -C documentation/examples/remote_storage
+      - run: make -C documentation/examples
       - prometheus/check_proto:
           version: "3.15.8"
       - prometheus/store_artifact:
@@ -58,13 +59,13 @@ jobs:
           keys:
             - v3-npm-deps-{{ checksum "web/ui/package-lock.json" }}
             - v3-npm-deps-
-      - run: make ui-install
+      - run: make assets-tarball
       - run: make ui-lint
-      - run: make ui-build-module
       - run: make ui-test
-      - run: make assets-tarball -o assets
-      - store_artifacts:
-          path: web/ui/static.tar.gz
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .tarballs
       - save_cache:
           key: v3-npm-deps-{{ checksum "web/ui/package-lock.json" }}
           paths:
@@ -148,7 +149,7 @@ workflows:
           promu_opts: "-p linux/amd64 -p windows/amd64 -p linux/arm64 -p darwin/amd64 -p darwin/arm64 -p linux/386"
           filters:
             tags:
-              ignore: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+              ignore: /^v2(\.[0-9]+){2}(-.+|[^-.]*)$/
             branches:
               ignore: /^(main|release-.*|.*build-all.*)$/
       - prometheus/build:
@@ -158,7 +159,7 @@ workflows:
             branches:
               only: /^(main|release-.*|.*build-all.*)$/
             tags:
-              only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+              only: /^v2(\.[0-9]+){2}(-.+|[^-.]*)$/
       - prometheus/publish_main:
           context: org-context
           requires:
@@ -177,7 +178,7 @@ workflows:
             - build_all
           filters:
             tags:
-              only: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
+              only: /^v2(\.[0-9]+){2}(-.+|[^-.]*)$/
             branches:
               ignore: /.*/
           image: circleci/golang:1-node

.github/CODEOWNERS

@@ -4,4 +4,4 @@
 /discovery/kubernetes @brancz
 /tsdb @codesome
 /promql @codesome @roidelapluie
-/cmd/promtool @jessicagreben @dgl
+/cmd/promtool @dgl

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,74 @@
+---
+name: Bug report
+description: Create a report to help us improve.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for opening a bug report for Prometheus.
+
+        Please do *NOT* ask support questions in Github issues.
+
+        If your issue is not a feature request or bug report use our [community support](https://prometheus.io/community/).
+
+        There is also [commercial support](https://prometheus.io/support-training/) available.
+  - type: textarea
+    attributes:
+      label: What did you do?
+      description: Please provide steps for us to reproduce this issue.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: What did you expect to see?
+  - type: textarea
+    attributes:
+      label: What did you see instead? Under which circumstances?
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        ## Environment
+  - type: input
+    attributes:
+      label: System information
+      description: insert output of `uname -srm` here, or operating system version
+      placeholder: e.g. Linux 5.16.15 x86_64
+  - type: textarea
+    attributes:
+      label: Prometheus version
+      description: Insert output of `prometheus --version` here.
+      render: text
+      placeholder: |
+        e.g. prometheus, version 2.23.0 (branch: HEAD, revision: 26d89b4b0776fe4cd5a3656dfa520f119a375273)
+          build user:       root@37609b3a0a21
+          build date:       20201126-10:56:17
+          go version:       go1.15.5
+          platform:         linux/amd64
+  - type: textarea
+    attributes:
+      label: Prometheus configuration file
+      description: Insert relevant configuration here. Don't forget to remove secrets.
+      render: yaml
+  - type: textarea
+    attributes:
+      label: Alertmanager version
+      description: Insert output of `alertmanager --version` here (if relevant to the issue).
+      render: text
+      placeholder: |
+        e.g. alertmanager, version 0.22.2 (branch: HEAD, revision: 44f8adc06af5101ad64bd8b9c8b18273f2922051)
+          build user:       root@b595c7f32520
+          build date:       20210602-07:50:37
+          go version:       go1.16.4
+          platform:         linux/amd64
+  - type: textarea
+    attributes:
+      label: Alertmanager configuration file
+      description: Insert relevant configuration here. Don't forget to remove secrets.
+      render: yaml
+  - type: textarea
+    attributes:
+      label: Logs
+      description: Insert Prometheus and Alertmanager logs relevant to the issue here.
+      render: text

.github/dependabot.yml

@@ -4,6 +4,10 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+  - package-ecosystem: "gomod"
+    directory: "/documentation/examples/remote_storage"
+    schedule:
+      interval: "monthly"
   - package-ecosystem: "npm"
     directory: "/web/ui"
     schedule:

.github/workflows/buf-lint.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1.3.1
+      - uses: bufbuild/buf-setup-action@v1.5.0
       - uses: bufbuild/buf-lint-action@v1
         with:
           input: 'prompb'

.github/workflows/buf.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1.3.1
+      - uses: bufbuild/buf-setup-action@v1.5.0
       - uses: bufbuild/buf-lint-action@v1
         with:
           input: 'prompb'

.github/workflows/codeql-analysis.yml

@@ -1,21 +1,10 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
+---
 name: "CodeQL"
 
 on:
   push:
     branches: [main, release-*]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [main]
   schedule:
     - cron: "26 14 * * 1"
@@ -24,44 +13,28 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+    permissions:
+      security-events: write
 
     strategy:
       fail-fast: false
       matrix:
         language: ["go", "javascript"]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '>=1.17 <1.18'
 
-      # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
+        uses: github/codeql-action/autobuild@v2
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

.github/workflows/golangci-lint.yml

@@ -21,7 +21,10 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: 1.18.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@v3.1.0
+        uses: golangci/golangci-lint-action@v3.2.0
         with:
           version: v1.45.2

.golangci.yml

@@ -16,6 +16,7 @@ linters:
     - misspell
 
 issues:
+  max-same-issues: 0
   exclude-rules:
     - path: _test.go
       linters:
@@ -29,6 +30,7 @@ linters-settings:
       - sync/atomic: "Use go.uber.org/atomic instead of sync/atomic"
       - github.com/stretchr/testify/assert: "Use github.com/stretchr/testify/require instead of github.com/stretchr/testify/assert"
       - github.com/go-kit/kit/log: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log"
+      - io/ioutil: "Use corresponding 'os' or 'io' functions instead."
       - regexp: "Use github.com/grafana/regexp instead of regexp"
   errcheck:
     exclude: scripts/errcheck_excludes.txt

.yamllint

@@ -14,6 +14,7 @@ rules:
   document-start: disable
   indentation:
     spaces: consistent
+    indent-sequences: consistent
   key-duplicates:
     ignore: |
       config/testdata/section_key_dup.bad.yml