From 81ffffbd9e0a6ae908c43c16fa4a95458b739f99 Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Wed, 8 Jan 2025 17:02:42 -0800 Subject: [PATCH] Update from nginxinc to nginx --- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/ci.yml | 6 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/dockerhub-description.yml | 2 +- .github/workflows/labeler.yml | 2 +- .goreleaser.yml | 18 +++--- CHANGELOG.md | 63 ++++++++++----------- CODEOWNERS | 2 +- CONTRIBUTING.md | 4 +- README.md | 34 +++++------ build/Dockerfile | 4 +- collector/nginx.go | 2 +- collector/nginx_plus.go | 2 +- exporter.go | 4 +- go.mod | 2 +- release-process.md | 25 ++++---- renovate.json | 2 +- 18 files changed, 89 insertions(+), 89 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 4e14a9ed1..0ff647e16 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: false contact_links: - name: General inquiries - url: https://github.com/nginxinc/nginx-prometheus-exporter/discussions + url: https://github.com/nginx/nginx-prometheus-exporter/discussions about: Please use Discussions for all other questions. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 25c5cc9ca..4d4f98eb3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,7 +7,7 @@ that issue here in this description (not in the title of the PR). Before creating a PR, run through this checklist and mark each as complete. -- [ ] I have read the [CONTRIBUTING](https://github.com/nginxinc/nginx-prometheus-exporter/blob/main/CONTRIBUTING.md) guide +- [ ] I have read the [CONTRIBUTING](https://github.com/nginx/nginx-prometheus-exporter/blob/main/CONTRIBUTING.md) guide - [ ] I have proven my fix is effective or that my feature works - [ ] I have checked that all unit tests pass after adding my changes - [ ] I have ensured the README is up to date diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9be035c0e..01177103d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,7 +118,7 @@ jobs: with: images: | name=nginx/nginx-prometheus-exporter,enable=${{ github.event_name != 'pull_request' }} - name=ghcr.io/nginxinc/nginx-prometheus-exporter,enable=${{ github.event_name != 'pull_request' }} + name=ghcr.io/nginx/nginx-prometheus-exporter,enable=${{ github.event_name != 'pull_request' }} name=public.ecr.aws/nginx/nginx-prometheus-exporter,enable=${{ github.event_name != 'pull_request' }} name=quay.io/nginx/nginx-prometheus-exporter,enable=${{ github.event_name != 'pull_request' }} name=localhost:5000/nginx/nginx-prometheus-exporter @@ -144,8 +144,8 @@ jobs: notes-footer: | ## Upgrade - - Use the {{version}} image from our [DockerHub](https://hub.docker.com/r/nginx/nginx-prometheus-exporter/tags?page=1&ordering=last_updated&name={{version-number}}), [GitHub Container](https://github.com/nginxinc/nginx-prometheus-exporter/pkgs/container/nginx-prometheus-exporter), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-prometheus-exporter) or [Quay.io](https://quay.io/repository/nginx/nginx-prometheus-exporter/tag/{{version-number}}?tab=tags). - - Download the latest binaries from the [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/{{version}}). + - Use the {{version}} image from our [DockerHub](https://hub.docker.com/r/nginx/nginx-prometheus-exporter/tags?page=1&ordering=last_updated&name={{version-number}}), [GitHub Container](https://github.com/nginx/nginx-prometheus-exporter/pkgs/container/nginx-prometheus-exporter), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-prometheus-exporter) or [Quay.io](https://quay.io/repository/nginx/nginx-prometheus-exporter/tag/{{version-number}}?tab=tags). + - Download the latest binaries from the [GitHub releases page](https://github.com/nginx/nginx-prometheus-exporter/releases/tag/{{version}}). - Update to the latest version with `brew upgrade nginx-prometheus-exporter`, `snap refresh nginx-prometheus-exporter` or `scoop update nginx-prometheus-exporter`. ## Compatibility diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index ae134d7ac..a965a6ac3 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -24,4 +24,4 @@ jobs: - name: Dependency Review uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0 with: - config-file: "nginxinc/k8s-common/dependency-review-config.yml@main" + config-file: "nginx/k8s-common/dependency-review-config.yml@main" diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml index 519a20a19..a32f27bcf 100644 --- a/.github/workflows/dockerhub-description.yml +++ b/.github/workflows/dockerhub-description.yml @@ -24,7 +24,7 @@ jobs: - name: Modify readme for DockerHub run: | sed -i '1,2d' README.md - sed -i 's/(LICENSE)/(https:\/\/github.com\/nginxinc\/nginx-prometheus-exporter\/blob\/main\/LICENSE)/' README.md + sed -i 's/(LICENSE)/(https:\/\/github.com\/nginx\/nginx-prometheus-exporter\/blob\/main\/LICENSE)/' README.md - name: Docker Hub Description uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4.0.0 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 23a95b449..84dfca8c9 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -17,7 +17,7 @@ jobs: sparse-checkout: | labeler.yml sparse-checkout-cone-mode: false - repository: nginxinc/k8s-common + repository: nginx/k8s-common - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 with: diff --git a/.goreleaser.yml b/.goreleaser.yml index 339cf91bb..9658635de 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -58,11 +58,11 @@ sboms: brews: - repository: - owner: nginxinc + owner: nginx name: homebrew-tap token: "{{ .Env.NGINX_GITHUB_TOKEN }}" directory: Formula - homepage: https://github.com/nginxinc/nginx-prometheus-exporter + homepage: https://github.com/nginx/nginx-prometheus-exporter description: NGINX Prometheus Exporter for NGINX and NGINX Plus license: Apache-2.0 commit_author: @@ -116,10 +116,10 @@ snapcrafts: nix: - name: nginx-prometheus-exporter repository: - owner: nginxinc + owner: nginx name: nur token: "{{ .Env.NGINX_GITHUB_TOKEN }}" - homepage: https://github.com/nginxinc/nginx-prometheus-exporter + homepage: https://github.com/nginx/nginx-prometheus-exporter description: NGINX Prometheus Exporter for NGINX and NGINX Plus license: asl20 commit_author: @@ -131,12 +131,12 @@ nix: winget: - name: nginx-prometheus-exporter - publisher: nginxinc + publisher: nginx license: Apache-2.0 - homepage: https://github.com/nginxinc/nginx-prometheus-exporter + homepage: https://github.com/nginx/nginx-prometheus-exporter short_description: NGINX Prometheus Exporter for NGINX and NGINX Plus repository: - owner: nginxinc + owner: nginx name: winget-pkgs token: "{{ .Env.NGINX_GITHUB_TOKEN }}" branch: "nginx-prometheus-exporter-{{.Version}}" @@ -150,11 +150,11 @@ winget: scoops: - repository: - owner: nginxinc + owner: nginx name: scoop-bucket token: "{{ .Env.NGINX_GITHUB_TOKEN }}" directory: bucket - homepage: https://github.com/nginxinc/nginx-prometheus-exporter + homepage: https://github.com/nginx/nginx-prometheus-exporter description: NGINX Prometheus Exporter for NGINX and NGINX Plus license: Apache-2.0 commit_author: diff --git a/CHANGELOG.md b/CHANGELOG.md index d95184610..0be96719e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,25 +1,24 @@ # Changelog -Starting with version 0.9.0 an automatically generated list of changes can be found on the [GitHub Releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases). +Starting with version 0.9.0 an automatically generated list of changes can be found on the [GitHub Releases page](https://github.com/nginx/nginx-prometheus-exporter/releases). ## 0.8.0 CHANGES: -- [103](https://github.com/nginxinc/nginx-prometheus-exporter/pull/103): Switch to `gcr.io/distroless/static` image. Use +- [103](https://github.com/nginx/nginx-prometheus-exporter/pull/103): Switch to `gcr.io/distroless/static` image. Use a non-root user to run the exporter process by default. Thanks to [Alex SZAKALY](https://github.com/alex1989hu). - Update Go version to 1.14 FIXES: -- [99](https://github.com/nginxinc/nginx-prometheus-exporter/pull/99): Fix link to metrics path. Thanks to [Yoan Blanc](https://github.com/greut). -- [101](https://github.com/nginxinc/nginx-prometheus-exporter/pull/101): docs: fix dockerfile link. Thanks to [Eric Carboni](https://github.com/eric-hc). +- [99](https://github.com/nginx/nginx-prometheus-exporter/pull/99): Fix link to metrics path. Thanks to [Yoan Blanc](https://github.com/greut). +- [101](https://github.com/nginx/nginx-prometheus-exporter/pull/101): docs: fix dockerfile link. Thanks to [Eric Carboni](https://github.com/eric-hc). UPGRADE: - Use the 0.8.0 image from our DockerHub: `nginx/nginx-prometheus-exporter:0.8.0` -- Download the latest binaries from [GitHub releases - page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/v0.8.0). +- Download the latest binaries from [GitHub releases page](https://github.com/nginx/nginx-prometheus-exporter/releases/tag/v0.8.0). COMPATIBILITY: @@ -30,18 +29,18 @@ COMPATIBILITY: FEATURES: -- [86](https://github.com/nginxinc/nginx-prometheus-exporter/pull/86): Implemented TLS client certificate +- [86](https://github.com/nginx/nginx-prometheus-exporter/pull/86): Implemented TLS client certificate authentication. Thanks to [Fabian Lüpke](https://github.com/Fluepke). FIXES: -- [96](https://github.com/nginxinc/nginx-prometheus-exporter/pull/96): Add const labels to upMetric. Thanks to [Robert +- [96](https://github.com/nginx/nginx-prometheus-exporter/pull/96): Add const labels to upMetric. Thanks to [Robert Toth](https://github.com/robert-toth). UPGRADE: - Use the 0.7.0 image from our DockerHub: `nginx/nginx-prometheus-exporter:0.7.0` -- Download the latest binaries from [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/v0.7.0). +- Download the latest binaries from [GitHub releases page](https://github.com/nginx/nginx-prometheus-exporter/releases/tag/v0.7.0). COMPATIBILITY: @@ -52,7 +51,7 @@ COMPATIBILITY: FEATURES: -- [77](https://github.com/nginxinc/nginx-prometheus-exporter/pull/77): Add constLabels support via cli arg/env variable. +- [77](https://github.com/nginx/nginx-prometheus-exporter/pull/77): Add constLabels support via cli arg/env variable. CHANGES: @@ -61,7 +60,7 @@ CHANGES: UPGRADE: - Use the 0.6.0 image from our DockerHub: `nginx/nginx-prometheus-exporter:0.6.0` -- Download the latest binaries from [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/v0.6.0). +- Download the latest binaries from [GitHub releases page](https://github.com/nginx/nginx-prometheus-exporter/releases/tag/v0.6.0). COMPATIBILITY: @@ -72,24 +71,24 @@ COMPATIBILITY: FEATURES: -- [70](https://github.com/nginxinc/nginx-prometheus-exporter/pull/70): Set user agent on scrape requests to nginx. -- [68](https://github.com/nginxinc/nginx-prometheus-exporter/pull/68): Add ability to scrape and listen on unix domain +- [70](https://github.com/nginx/nginx-prometheus-exporter/pull/70): Set user agent on scrape requests to nginx. +- [68](https://github.com/nginx/nginx-prometheus-exporter/pull/68): Add ability to scrape and listen on unix domain sockets. -- [64](https://github.com/nginxinc/nginx-prometheus-exporter/pull/64): Add location zone and resolver metric support. +- [64](https://github.com/nginx/nginx-prometheus-exporter/pull/64): Add location zone and resolver metric support. FIXES: -- [73](https://github.com/nginxinc/nginx-prometheus-exporter/pull/73): Fix typo in stream_zone_sync_status_nodes_online +- [73](https://github.com/nginx/nginx-prometheus-exporter/pull/73): Fix typo in stream_zone_sync_status_nodes_online metric description. -- [71](https://github.com/nginxinc/nginx-prometheus-exporter/pull/71): Do not assume default datasource in Grafana +- [71](https://github.com/nginx/nginx-prometheus-exporter/pull/71): Do not assume default datasource in Grafana panels. -- [62](https://github.com/nginxinc/nginx-prometheus-exporter/pull/62): Set correct nginx_up query and instance variable +- [62](https://github.com/nginx/nginx-prometheus-exporter/pull/62): Set correct nginx_up query and instance variable expression. UPGRADE: - Use the 0.5.0 image from our DockerHub: `nginx/nginx-prometheus-exporter:0.5.0` -- Download the latest binaries from [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/v0.5.0). +- Download the latest binaries from [GitHub releases page](https://github.com/nginx/nginx-prometheus-exporter/releases/tag/v0.5.0). COMPATIBILITY: @@ -100,14 +99,14 @@ COMPATIBILITY: FIXES: -- [60](https://github.com/nginxinc/nginx-prometheus-exporter/pull/60): *Fix session metrics for stream server zones*. +- [60](https://github.com/nginx/nginx-prometheus-exporter/pull/60): _Fix session metrics for stream server zones_. Session metrics with a status of `4xx` or `5xx` are now correctly reported. Previously they were always reported as `0`. UPGRADE: - Use the 0.4.2 image from our DockerHub: `nginx/nginx-prometheus-exporter:0.4.2` -- Download the latest binaries from [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/v0.4.2). +- Download the latest binaries from [GitHub releases page](https://github.com/nginx/nginx-prometheus-exporter/releases/tag/v0.4.2). COMPATIBILITY: @@ -118,13 +117,13 @@ COMPATIBILITY: FIXES: -- [55](https://github.com/nginxinc/nginx-prometheus-exporter/pull/55): Do not export zone sync metrics if they are not +- [55](https://github.com/nginx/nginx-prometheus-exporter/pull/55): Do not export zone sync metrics if they are not reported by NGINX Plus. Previously, in such case, the metrics were exported with zero values. UPGRADE: - Use the 0.4.1 image from our DockerHub: `nginx/nginx-prometheus-exporter:0.4.1` -- Download the latest binaries from [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/v0.4.1). +- Download the latest binaries from [GitHub releases page](https://github.com/nginx/nginx-prometheus-exporter/releases/tag/v0.4.1). COMPATIBILITY: @@ -135,15 +134,15 @@ COMPATIBILITY: FEATURES: -- [50](https://github.com/nginxinc/nginx-prometheus-exporter/pull/50): Add zone sync metrics support. -- [37](https://github.com/nginxinc/nginx-prometheus-exporter/pull/37): Implement a way to retry connection to NGINX if +- [50](https://github.com/nginx/nginx-prometheus-exporter/pull/50): Add zone sync metrics support. +- [37](https://github.com/nginx/nginx-prometheus-exporter/pull/37): Implement a way to retry connection to NGINX if it is unreachable. Add -nginx.retries for setting the number of retries and -nginx.retry-interval for setting the interval between retries, both as cli-arguments. UPGRADE: - Use the 0.4.0 image from our DockerHub: `nginx/nginx-prometheus-exporter:0.4.0` -- Download the latest binaries from [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/v0.4.0). +- Download the latest binaries from [GitHub releases page](https://github.com/nginx/nginx-prometheus-exporter/releases/tag/v0.4.0). COMPATIBILITY: @@ -154,14 +153,14 @@ COMPATIBILITY: FEATURES: -- [32](https://github.com/nginxinc/nginx-prometheus-exporter/pull/32): Add nginxexporter_build_info metric. -- [31](https://github.com/nginxinc/nginx-prometheus-exporter/pull/31): Implement nginx_up and nginxplus_up metrics. Add +- [32](https://github.com/nginx/nginx-prometheus-exporter/pull/32): Add nginxexporter_build_info metric. +- [31](https://github.com/nginx/nginx-prometheus-exporter/pull/31): Implement nginx_up and nginxplus_up metrics. Add -nginx.timeout cli argument for setting a timeout for scrapping metrics from NGINX or NGINX Plus. UPGRADE: - Use the 0.3.0 image from our DockerHub: `nginx/nginx-prometheus-exporter:0.3.0` -- Download the latest binaries from [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/v0.3.0). +- Download the latest binaries from [GitHub releases page](https://github.com/nginx/nginx-prometheus-exporter/releases/tag/v0.3.0). COMPATIBILITY: @@ -172,15 +171,15 @@ COMPATIBILITY: FEATURES: -- [16](https://github.com/nginxinc/nginx-prometheus-exporter/pull/16): Add stream metrics support. -- [13](https://github.com/nginxinc/nginx-prometheus-exporter/pull/13): Add a flag for controlling SSL verification of +- [16](https://github.com/nginx/nginx-prometheus-exporter/pull/16): Add stream metrics support. +- [13](https://github.com/nginx/nginx-prometheus-exporter/pull/13): Add a flag for controlling SSL verification of NGINX stub_status/API endpoint. Thanks to [Raza Jhaveri](https://github.com/razaj92). -- [3](https://github.com/nginxinc/nginx-prometheus-exporter/pull/3): Support for environment variables. +- [3](https://github.com/nginx/nginx-prometheus-exporter/pull/3): Support for environment variables. UPGRADE: - Use the 0.2.0 image from our DockerHub: `nginx/nginx-prometheus-exporter:0.2.0` -- Download the latest binaries from [GitHub releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases/tag/v0.2.0). +- Download the latest binaries from [GitHub releases page](https://github.com/nginx/nginx-prometheus-exporter/releases/tag/v0.2.0). COMPATIBILITY: diff --git a/CODEOWNERS b/CODEOWNERS index 77ed024ef..47d9e5959 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @nginxinc/integrations +* @nginx/integrations diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 44c6cbb7e..8356d9d55 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ are considering contributing! ## Ask a Question -To ask a question please use [Github Discussions](https://github.com/nginxinc/nginx-prometheus-exporter/discussions). +To ask a question please use [Github Discussions](https://github.com/nginx/nginx-prometheus-exporter/discussions). You can also join our [Community Slack](https://community.nginx.org/joinslack) which has a wider NGINX audience. @@ -98,6 +98,6 @@ can be merged. Your agreement signature will be safely stored by F5 and no longe - Run `gofmt` over your code to automatically resolve a lot of style issues. Most editors support this running automatically when saving a code file. - Run `go lint` and `go vet` on your code too to catch any other issues. -- Follow this guide on some good practice and idioms for Go - +- Follow this guide on some good practice and idioms for Go - - To check for extra issues, install [golangci-lint](https://github.com/golangci/golangci-lint) and run `make lint` or `golangci-lint run` diff --git a/README.md b/README.md index 6e029d2e0..0e99782e2 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -[![OpenSSFScorecard](https://api.securityscorecards.dev/projects/github.com/nginxinc/nginx-prometheus-exporter/badge)](https://scorecard.dev/viewer/?uri=github.com/nginxinc/nginx-prometheus-exporter) -[![CI](https://github.com/nginxinc/nginx-prometheus-exporter/actions/workflows/ci.yml/badge.svg)](https://github.com/nginxinc/nginx-prometheus-exporter/actions/workflows/ci.yml) -[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-prometheus-exporter.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-prometheus-exporter?ref=badge_shield) -[![Go Report Card](https://goreportcard.com/badge/github.com/nginxinc/nginx-prometheus-exporter)](https://goreportcard.com/report/github.com/nginxinc/nginx-prometheus-exporter) -[![codecov](https://codecov.io/gh/nginxinc/nginx-prometheus-exporter/graph/badge.svg?token=J6Oz10LWy3)](https://codecov.io/gh/nginxinc/nginx-prometheus-exporter) -![GitHub all releases](https://img.shields.io/github/downloads/nginxinc/nginx-prometheus-exporter/total?logo=github) -![GitHub release (latest by SemVer)](https://img.shields.io/github/downloads/nginxinc/nginx-prometheus-exporter/latest/total?sort=semver&logo=github) -[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/nginxinc/nginx-prometheus-exporter?logo=github&sort=semver)](https://github.com/nginxinc/nginx-prometheus-exporter/releases/latest) +[![OpenSSFScorecard](https://api.securityscorecards.dev/projects/github.com/nginx/nginx-prometheus-exporter/badge)](https://scorecard.dev/viewer/?uri=github.com/nginx/nginx-prometheus-exporter) +[![CI](https://github.com/nginx/nginx-prometheus-exporter/actions/workflows/ci.yml/badge.svg)](https://github.com/nginx/nginx-prometheus-exporter/actions/workflows/ci.yml) +[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginx%2Fnginx-prometheus-exporter.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginx%2Fnginx-prometheus-exporter?ref=badge_shield) +[![Go Report Card](https://goreportcard.com/badge/github.com/nginx/nginx-prometheus-exporter)](https://goreportcard.com/report/github.com/nginx/nginx-prometheus-exporter) +[![codecov](https://codecov.io/gh/nginx/nginx-prometheus-exporter/graph/badge.svg?token=J6Oz10LWy3)](https://codecov.io/gh/nginx/nginx-prometheus-exporter) +![GitHub all releases](https://img.shields.io/github/downloads/nginx/nginx-prometheus-exporter/total?logo=github) +![GitHub release (latest by SemVer)](https://img.shields.io/github/downloads/nginx/nginx-prometheus-exporter/latest/total?sort=semver&logo=github) +[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/nginx/nginx-prometheus-exporter?logo=github&sort=semver)](https://github.com/nginx/nginx-prometheus-exporter/releases/latest) [![nginx-prometheus-exporter](https://snapcraft.io/nginx-prometheus-exporter/badge.svg)](https://snapcraft.io/nginx-prometheus-exporter) -![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/nginxinc/nginx-prometheus-exporter?logo=go) +![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/nginx/nginx-prometheus-exporter?logo=go) [![Docker Pulls](https://img.shields.io/docker/pulls/nginx/nginx-prometheus-exporter?logo=docker&logoColor=white)](https://hub.docker.com/r/nginx/nginx-prometheus-exporter) ![Docker Image Size (latest semver)](https://img.shields.io/docker/image-size/nginx/nginx-prometheus-exporter?logo=docker&logoColor=white&sort=semver) [![Slack](https://img.shields.io/badge/slack-%23nginx--prometheus--exporter-green?logo=slack)](https://nginxcommunity.slack.com/channels/nginx-prometheus-exporter) @@ -90,7 +90,7 @@ In this section, we show how to quickly run NGINX Prometheus Exporter for NGINX ### A Note about NGINX Ingress Controller If you’d like to use the NGINX Prometheus Exporter with [NGINX Ingress -Controller](https://github.com/nginxinc/kubernetes-ingress/) for Kubernetes, see [this +Controller](https://github.com/nginx/kubernetes-ingress/) for Kubernetes, see [this doc](https://docs.nginx.com/nginx-ingress-controller/logging-and-monitoring/prometheus/) for the installation instructions. @@ -448,24 +448,24 @@ logs using [docker logs](https://docs.docker.com/engine/reference/commandline/lo ### Docker images We publish the Docker image on [DockerHub](https://hub.docker.com/r/nginx/nginx-prometheus-exporter/), -[GitHub Container](https://github.com/nginxinc/nginx-prometheus-exporter/pkgs/container/nginx-prometheus-exporter), +[GitHub Container](https://github.com/nginx/nginx-prometheus-exporter/pkgs/container/nginx-prometheus-exporter), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-prometheus-exporter) and [Quay.io](https://quay.io/repository/nginx/nginx-prometheus-exporter). -As an alternative, you can choose the _edge_ version built from the [latest commit](https://github.com/nginxinc/nginx-prometheus-exporter/commits/main) +As an alternative, you can choose the _edge_ version built from the [latest commit](https://github.com/nginx/nginx-prometheus-exporter/commits/main) from the main branch. The edge version is useful for experimenting with new features that are not yet published in a stable release. ### Binaries -We publish the binaries for multiple Operating Systems and architectures on the GitHub [releases page](https://github.com/nginxinc/nginx-prometheus-exporter/releases). +We publish the binaries for multiple Operating Systems and architectures on the GitHub [releases page](https://github.com/nginx/nginx-prometheus-exporter/releases). ### Homebrew You can add the NGINX homebrew tap with ```console -brew tap nginxinc/tap +brew tap nginx/tap ``` and then install the formula with @@ -487,7 +487,7 @@ snap install nginx-prometheus-exporter You can add the NGINX Scoop bucket with ```console -scoop bucket add nginx https://github.com/nginxinc/scoop-bucket.git +scoop bucket add nginx https://github.com/nginx/scoop-bucket.git ``` and then install the package with @@ -563,7 +563,7 @@ The SBOMs for the binaries are available in the releases page. The SBOMs are gen The SBOM for the Docker image is available in the [DockerHub](https://hub.docker.com/r/nginx/nginx-prometheus-exporter), -[GitHub Container registry](https://github.com/nginxinc/nginx-prometheus-exporter/pkgs/container/nginx-prometheus-exporter), +[GitHub Container registry](https://github.com/nginx/nginx-prometheus-exporter/pkgs/container/nginx-prometheus-exporter), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-prometheus-exporter) and [Quay.io](https://quay.io/repository/nginx/nginx-prometheus-exporter) repositories. The SBOMs are generated using [syft](https://github.com/anchore/syft) and stored as an attestation in the image manifest. @@ -579,7 +579,7 @@ docker buildx imagetools inspect nginx/nginx-prometheus-exporter:edge --format ' We generate provenance for the Docker image and it's available in the [DockerHub](https://hub.docker.com/r/nginx/nginx-prometheus-exporter), -[GitHub Container registry](https://github.com/nginxinc/nginx-prometheus-exporter/pkgs/container/nginx-prometheus-exporter), +[GitHub Container registry](https://github.com/nginx/nginx-prometheus-exporter/pkgs/container/nginx-prometheus-exporter), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-prometheus-exporter) and [Quay.io](https://quay.io/repository/nginx/nginx-prometheus-exporter) repositories, stored as an attestation in the image manifest. diff --git a/build/Dockerfile b/build/Dockerfile index 7a495a5fb..0e70db3ec 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -3,7 +3,7 @@ FROM golang:1.23 AS builder ARG VERSION ARG TARGETARCH -WORKDIR /go/src/github.com/nginxinc/nginx-prometheus-exporter +WORKDIR /go/src/github.com/nginx/nginx-prometheus-exporter COPY --link go.mod go.sum ./ RUN go mod download @@ -24,7 +24,7 @@ ENTRYPOINT [ "/usr/bin/nginx-prometheus-exporter" ] FROM base AS container -COPY --from=builder --link /go/src/github.com/nginxinc/nginx-prometheus-exporter/nginx-prometheus-exporter /usr/bin/ +COPY --from=builder --link /go/src/github.com/nginx/nginx-prometheus-exporter/nginx-prometheus-exporter /usr/bin/ FROM base AS goreleaser diff --git a/collector/nginx.go b/collector/nginx.go index aada8b614..e7cc1b1bc 100644 --- a/collector/nginx.go +++ b/collector/nginx.go @@ -4,7 +4,7 @@ import ( "log/slog" "sync" - "github.com/nginxinc/nginx-prometheus-exporter/client" + "github.com/nginx/nginx-prometheus-exporter/client" "github.com/prometheus/client_golang/prometheus" ) diff --git a/collector/nginx_plus.go b/collector/nginx_plus.go index 0f524ff1c..6a0cf7ffe 100644 --- a/collector/nginx_plus.go +++ b/collector/nginx_plus.go @@ -623,7 +623,7 @@ func (c *NginxPlusCollector) Collect(ch chan<- prometheus.Metric) { c.mutex.Lock() // To protect metrics from concurrent collects defer c.mutex.Unlock() - // FIXME: https://github.com/nginxinc/nginx-prometheus-exporter/issues/858 + // FIXME: https://github.com/nginx/nginx-prometheus-exporter/issues/858 stats, err := c.nginxClient.GetStats(context.TODO()) if err != nil { c.upMetric.Set(nginxDown) diff --git a/exporter.go b/exporter.go index 7f1654443..e3e7c05fe 100644 --- a/exporter.go +++ b/exporter.go @@ -16,9 +16,9 @@ import ( "syscall" "time" + "github.com/nginx/nginx-prometheus-exporter/client" + "github.com/nginx/nginx-prometheus-exporter/collector" plusclient "github.com/nginxinc/nginx-plus-go-client/v2/client" - "github.com/nginxinc/nginx-prometheus-exporter/client" - "github.com/nginxinc/nginx-prometheus-exporter/collector" "github.com/alecthomas/kingpin/v2" "github.com/prometheus/client_golang/prometheus" diff --git a/go.mod b/go.mod index 89e456a5b..2db9351f9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/nginxinc/nginx-prometheus-exporter +module github.com/nginx/nginx-prometheus-exporter go 1.22.6 diff --git a/release-process.md b/release-process.md index ef1e7da8b..33c77c635 100644 --- a/release-process.md +++ b/release-process.md @@ -19,7 +19,7 @@ The project follows [Semantic Versioning](https://semver.org/). ## Release Planning and Development The features that will go into the next release are reflected in the -corresponding [milestone](https://github.com/nginxinc/nginx-prometheus-exporter/milestones). Refer to +corresponding [milestone](https://github.com/nginx/nginx-prometheus-exporter/milestones). Refer to the [Issue Lifecycle](/ISSUE_LIFECYCLE.md) document for information on issue creation and assignment to releases. ## Releasing a New Version @@ -27,19 +27,20 @@ the [Issue Lifecycle](/ISSUE_LIFECYCLE.md) document for information on issue cre 1. Create an issue to define and track release-related activities. Choose a title that follows the format `Release X.Y.Z`. 2. Stop merging any new work into the main branch. -3. Check the release draft under the [GitHub releases](https://github.com/nginxinc/nginx-prometheus-exporter/releases) page -to ensure that everything is in order. +3. Check the release draft under the [GitHub releases](https://github.com/nginx/nginx-prometheus-exporter/releases) page + to ensure that everything is in order. 4. Create a PR to update the version in the `Makefile` and [README](README.md) to the new version, and any other necessary changes. 5. Once the PR is merged, create a new release tag in the format `vX.Y.Z`: - ```bash - git tag -a vX.Y.Z -m "Release vX.Y.Z" - git push origin vX.Y.Z - ``` + ```bash + git tag -a vX.Y.Z -m "Release vX.Y.Z" + git push origin vX.Y.Z + ``` - As a result, the CI/CD pipeline will: - - Build the Docker image and push it to the registries. - - Publish the release to Snapcraft, Homebrew, Scoop, and Nix. - - Create a GitHub release with the autogenerated changelog and artifacts attached. - - Announce the release in the community Slack. + As a result, the CI/CD pipeline will: + + - Build the Docker image and push it to the registries. + - Publish the release to Snapcraft, Homebrew, Scoop, and Nix. + - Create a GitHub release with the autogenerated changelog and artifacts attached. + - Announce the release in the community Slack. diff --git a/renovate.json b/renovate.json index 8bf65f91c..891b58690 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>nginxinc/k8s-common", + "github>nginx/k8s-common", "schedule:earlyMondays" ] }