Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Merge upstream, and add aggregate labels to build faster graphs #2

Merged
merged 42 commits into from
Nov 7, 2024

Commits on Aug 27, 2024

  1. Update common Prometheus files (prometheus#1235)

    Signed-off-by: prombot <[email protected]>
    prombot authored Aug 27, 2024
    Configuration menu
    Copy the full SHA
    23680cc View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Add type to parse date and time (prometheus#1234)

    Add new type ParseDateAndTime to parse timestamps from DisplayString
    and report it as unix timestamp.
    
    * Add type to parse date and time (fixes: prometheus#1232)
    * Change date and time parsing to use strptime format
    
    ---------
    
    Signed-off-by: PhiBo <[email protected]>
    phibos authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    1d75633 View commit details
    Browse the repository at this point in the history
  2. Update common Prometheus files (prometheus#1238)

    Signed-off-by: prombot <[email protected]>
    prombot authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    683caef View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2024

  1. Bump github.com/prometheus/common from 0.55.0 to 0.57.0

    Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.55.0 to 0.57.0.
    - [Release notes](https://github.com/prometheus/common/releases)
    - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md)
    - [Commits](prometheus/common@v0.55.0...v0.57.0)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/prometheus/common
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Sep 1, 2024
    Configuration menu
    Copy the full SHA
    50f4cdd View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Update common Prometheus files

    Signed-off-by: prombot <[email protected]>
    prombot committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    3e52d46 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2024

  1. Merge pull request prometheus#1242 from prometheus/dependabot/go_modu…

    …les/github.com/prometheus/common-0.57.0
    
    Bump github.com/prometheus/common from 0.55.0 to 0.57.0
    bastischubert authored Sep 8, 2024
    Configuration menu
    Copy the full SHA
    77b8a81 View commit details
    Browse the repository at this point in the history
  2. Bump github.com/prometheus/client_golang from 1.20.0 to 1.20.3

    Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.0 to 1.20.3.
    - [Release notes](https://github.com/prometheus/client_golang/releases)
    - [Changelog](https://github.com/prometheus/client_golang/blob/v1.20.3/CHANGELOG.md)
    - [Commits](prometheus/client_golang@v1.20.0...v1.20.3)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/prometheus/client_golang
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Sep 8, 2024
    Configuration menu
    Copy the full SHA
    d62dc6f View commit details
    Browse the repository at this point in the history
  3. Merge pull request prometheus#1245 from prometheus/dependabot/go_modu…

    …les/github.com/prometheus/client_golang-1.20.3
    
    Bump github.com/prometheus/client_golang from 1.20.0 to 1.20.3
    bastischubert authored Sep 8, 2024
    Configuration menu
    Copy the full SHA
    cec9c33 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    693785d View commit details
    Browse the repository at this point in the history
  5. Bump github.com/gosnmp/gosnmp from 1.37.0 to 1.38.0

    Bumps [github.com/gosnmp/gosnmp](https://github.com/gosnmp/gosnmp) from 1.37.0 to 1.38.0.
    - [Release notes](https://github.com/gosnmp/gosnmp/releases)
    - [Changelog](https://github.com/gosnmp/gosnmp/blob/master/CHANGELOG.md)
    - [Commits](gosnmp/gosnmp@v1.37.0...v1.38.0)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/gosnmp/gosnmp
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Sep 8, 2024
    Configuration menu
    Copy the full SHA
    b6f33fb View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Merge pull request prometheus#1243 from prometheus/dependabot/go_modu…

    …les/github.com/gosnmp/gosnmp-1.38.0
    
    Bump github.com/gosnmp/gosnmp from 1.37.0 to 1.38.0
    bastischubert authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    3e59d0f View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Merge pull request prometheus#1244 from prometheus/repo_sync

    Synchronize common files from prometheus/prometheus
    bastischubert authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    807f199 View commit details
    Browse the repository at this point in the history
  2. Add support for Sophos XG devices (prometheus#1239)

    Signed-off-by: PhiBo <[email protected]>
    phibos authored Sep 12, 2024
    Configuration menu
    Copy the full SHA
    f1e5797 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Update common Prometheus files

    Signed-off-by: prombot <[email protected]>
    prombot committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    bacd059 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Merge pull request prometheus#1246 from prometheus/repo_sync

    Synchronize common files from prometheus/prometheus
    bastischubert authored Sep 20, 2024
    Configuration menu
    Copy the full SHA
    af7d9a2 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. Configuration menu
    Copy the full SHA
    efa792c View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Bump github.com/prometheus/client_golang from 1.20.3 to 1.20.4

    Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.3 to 1.20.4.
    - [Release notes](https://github.com/prometheus/client_golang/releases)
    - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
    - [Commits](prometheus/client_golang@v1.20.3...v1.20.4)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/prometheus/client_golang
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    a005e3e View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Merge pull request prometheus#1251 from prometheus/dependabot/go_modu…

    …les/github.com/prometheus/client_golang-1.20.4
    
    Bump github.com/prometheus/client_golang from 1.20.3 to 1.20.4
    bastischubert authored Oct 2, 2024
    Configuration menu
    Copy the full SHA
    b9f0e96 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Update common Prometheus files (prometheus#1255)

    Signed-off-by: prombot <[email protected]>
    prombot authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    1992ef1 View commit details
    Browse the repository at this point in the history
  2. Bump github.com/prometheus/common from 0.57.0 to 0.60.0 (prometheus#1254

    )
    
    Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.57.0 to 0.60.0.
    - [Release notes](https://github.com/prometheus/common/releases)
    - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md)
    - [Commits](prometheus/common@v0.57.0...v0.60.0)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/prometheus/common
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    dd39255 View commit details
    Browse the repository at this point in the history
  3. chore!: adopt log/slog, drop go-kit/log (prometheus#1249)

    This PR includes:
    - Go version updates, so that `log/slog` can be used
    - linter updates to remove configs for `go-kit/log` that are no longer
      needed, and enable `sloglint` linter
    - Go dep updates for prometheus/{client_golang,common,exporter-toolkit}
      libs
    
    The bulk of this PR was automated by the following script which is being
    used to aid in converting the various exporters/projects to use slog:
    
    https://gist.github.com/tjhop/49f96fb7ebbe55b12deee0b0312d8434
    
    Builds and passes tests.
    
    Signed-off-by: TJ Hoplock <[email protected]>
    tjhop authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    dc96963 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Update common Prometheus files (prometheus#1260)

    Signed-off-by: prombot <[email protected]>
    prombot authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    cf28621 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. Fix Sophos mibs unpack (prometheus#1266)

    Signed-off-by: Matvey Kruglov <[email protected]>
    subuk authored Oct 12, 2024
    Configuration menu
    Copy the full SHA
    e7309c4 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Add HPE MIBs

    Signed-off-by: dsgnr <[email protected]>
    dsgnr committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    1195562 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Merge pull request prometheus#1247 from unarep/use-unconnected-UDP-so…

    …cket
    
    Set UseUnconnectedUDPSocket option if one of the modules has if set
    bastischubert authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    acb8d71 View commit details
    Browse the repository at this point in the history
  2. updated generator doc; fixes prometheus#1268

    Signed-off-by: Sebastian Schubert <[email protected]>
    bastischubert committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    5e3f68c View commit details
    Browse the repository at this point in the history
  3. Merge pull request prometheus#1270 from bastischubert/bastischubert/1…

    …729196855
    
    updated generator doc; fixes prometheus#1268
    bastischubert authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    df1b28d View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Descriptions for HPE OIDs

    Signed-off-by: dsgnr <[email protected]>
    dsgnr committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    c2b6a57 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Improve config error message

    Improve config parsing error message for cases where the generator
    is built from a commit that supports newer features than the deployed
    exporter.
    
    Signed-off-by: SuperQ <[email protected]>
    SuperQ committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    a411322 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. Merge pull request prometheus#1274 from prometheus/superq/config_error

    Improve config error message
    bastischubert authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    1cc1e66 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0c6b6ed View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. Bump github.com/prometheus/common from 0.60.0 to 0.60.1

    Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.60.0 to 0.60.1.
    - [Release notes](https://github.com/prometheus/common/releases)
    - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md)
    - [Commits](prometheus/common@v0.60.0...v0.60.1)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/prometheus/common
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    493176b View commit details
    Browse the repository at this point in the history
  2. Bump github.com/prometheus/client_golang from 1.20.4 to 1.20.5

    Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.4 to 1.20.5.
    - [Release notes](https://github.com/prometheus/client_golang/releases)
    - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
    - [Commits](prometheus/client_golang@v1.20.4...v1.20.5)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/prometheus/client_golang
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Nov 1, 2024
    Configuration menu
    Copy the full SHA
    2be1a53 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Update common Prometheus files

    Signed-off-by: prombot <[email protected]>
    prombot committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    c993bae View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2024

  1. Merge pull request prometheus#1277 from prometheus/dependabot/go_modu…

    …les/github.com/prometheus/common-0.60.1
    
    Bump github.com/prometheus/common from 0.60.0 to 0.60.1
    bastischubert authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    e12a46c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1e985e6 View commit details
    Browse the repository at this point in the history
  3. Bump github.com/prometheus/exporter-toolkit from 0.13.0 to 0.13.1

    Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit) from 0.13.0 to 0.13.1.
    - [Release notes](https://github.com/prometheus/exporter-toolkit/releases)
    - [Changelog](https://github.com/prometheus/exporter-toolkit/blob/master/CHANGELOG.md)
    - [Commits](prometheus/exporter-toolkit@v0.13.0...v0.13.1)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/prometheus/exporter-toolkit
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    842b1fe View commit details
    Browse the repository at this point in the history
  4. Merge pull request prometheus#1278 from prometheus/dependabot/go_modu…

    …les/github.com/prometheus/exporter-toolkit-0.13.1
    
    Bump github.com/prometheus/exporter-toolkit from 0.13.0 to 0.13.1
    bastischubert authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    e000dfb View commit details
    Browse the repository at this point in the history
  5. Merge pull request prometheus#1279 from prometheus/dependabot/go_modu…

    …les/github.com/prometheus/client_golang-1.20.5
    
    Bump github.com/prometheus/client_golang from 1.20.4 to 1.20.5
    bastischubert authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    1eca12c View commit details
    Browse the repository at this point in the history
  6. Merge pull request prometheus#1282 from prometheus/repo_sync

    Synchronize common files from prometheus/prometheus
    bastischubert authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    5a6abf3 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. Merge remote-tracking branch 'refs/remotes/upstream/main' into promet…

    …heus-main
    
    # Conflicts:
    #	.circleci/config.yml
    #	.github/workflows/container_description.yml
    #	.github/workflows/golangci-lint.yml
    #	collector/collector.go
    #	go.mod
    #	go.sum
    #	main.go
    #	snmp.yml
    nicko170 committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    a806f84 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d65a517 View commit details
    Browse the repository at this point in the history