Skip to content

Commit

Permalink
Update from nginxinc to nginx (#943)
Browse files Browse the repository at this point in the history
  • Loading branch information
lucacome authored Jan 9, 2025
1 parent 103484a commit 8da901c
Show file tree
Hide file tree
Showing 19 changed files with 106 additions and 106 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/dockerhub-description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
18 changes: 9 additions & 9 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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}}"
Expand All @@ -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:
Expand Down
63 changes: 31 additions & 32 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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:

Expand All @@ -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:

Expand All @@ -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:

Expand All @@ -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:

Expand All @@ -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:

Expand All @@ -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:

Expand All @@ -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:

Expand All @@ -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:

Expand All @@ -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:

Expand All @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @nginxinc/integrations
* @nginx/integrations
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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 - <https://github.com/golang/go/wiki/CodeReviewComments>
- Follow this guide on some good practice and idioms for Go - <https://github.com/golang/go/wiki/CodeReviewComments>
- To check for extra issues, install [golangci-lint](https://github.com/golangci/golangci-lint) and run `make lint` or
`golangci-lint run`
Loading

0 comments on commit 8da901c

Please sign in to comment.