Merge upstream commits#3
Merged
Merged
Conversation
Upgrade alpine to 3.18
* Bump GO to 1.22 * Extending firewall metrics with rule names * Adding account specific rule to firewall metrics * Add Cloudflare Logpush metrics for account and zone * Selector is included in labels Bump chart version * Add Account Label to Metrics This commit adds the Account label to the metrics label list. The Account label provides additional context to the metrics, allowing for better categorization and analysis of data. This change enhances the accuracy and granularity of the metrics collected. - Added Account label to metrics - Improved data categorization and analysis Signed-off-by: Denys Lemeshko <lde@linuxhelp.com.ua> Fix missing label * Add account to labels on logpush events, bump golangci fix golang-ci lint action some golangci-lint fixes * Use cobra and viper as maintained alternatives to namsral/flag library. Add basic tests just make sure you provide .env file with right variables. --------- Co-authored-by: Oleksii Serhiienko <oleksii.serhiienko@getyourguide.com> Co-authored-by: Bhushan Thakur <bhthakur@redhat.com> Co-authored-by: Mark Pierce <mark.pierce@debijenkorf.nl> Co-authored-by: Denys Lemeshko <lde@linuxhelp.com.ua>
Bumps alpine from 3.18 to 3.19. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@v1...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@v2...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v1...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v2...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 5. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v2...v5) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
fix: CF_ZONES env var
…/docker/build-push-action-5 Bump docker/build-push-action from 2 to 5
…/actions/checkout-4 Bump actions/checkout from 2 to 4
…/docker/login-action-3 Bump docker/login-action from 1 to 3
…/actions/setup-python-5 Bump actions/setup-python from 2 to 5
…/docker/setup-buildx-action-3 Bump docker/setup-buildx-action from 1 to 3
…3.19 Bump alpine from 3.18 to 3.19
Bumps alpine from 3.19 to 3.20. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 1 to 3. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](docker/setup-qemu-action@v1...v3) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.2.0 to 1.10.0. - [Release notes](https://github.com/helm/kind-action/releases) - [Commits](helm/kind-action@v1.2.0...v1.10.0) --- updated-dependencies: - dependency-name: helm/kind-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [azure/setup-helm](https://github.com/azure/setup-helm) from 1 to 4. - [Release notes](https://github.com/azure/setup-helm/releases) - [Changelog](https://github.com/Azure/setup-helm/blob/main/CHANGELOG.md) - [Commits](Azure/setup-helm@v1...v4) --- updated-dependencies: - dependency-name: azure/setup-helm dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 3 to 5. - [Release notes](https://github.com/docker/metadata-action/releases) - [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md) - [Commits](docker/metadata-action@v3...v5) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v5...v6) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
We currently have `datetime` and `status` as dimensions for the CloudFlare Worker invocation metrics GraphQL query. This causes CloudFlare workers to output a number of datapoints for each unique tuple of dimensions, across several `datetime`s. For worker requests and errors this is fine as we `.Add(...)` to those counters, but for quantiles this causes us to only export the last datapoints quantiles, which may be an outlier. --- Removing the `datetime` for the query provides pre-aggregated datapoints for us to process. Further to this, `datetime` is not currently being captured in the response data structure.
This change adds `status` to the CloudFlare worker metrics being exported. This fixes an issue where, similar to `datetime` previously, we are getting multiple metric series from the combinations of unique dimensions. This resulted in only the last datapoint series being exported from the `cloudflare-exporter` for the CloudFlare workers. Additionally this provides more information as the `status` can be used to differentiate the internal errors seen in CloudFlare workers.
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5 to 6. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v5...v6) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…/actions/setup-go-6 Bump actions/setup-go from 5 to 6
Change to KO and attest container images
fix: Remove fatal errors outside main.go to improve flexibility
Set Filtering Zone to debug
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
Bumps [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance) from 2 to 3. - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](actions/attest-build-provenance@v2...v3) --- updated-dependencies: - dependency-name: actions/attest-build-provenance dependency-version: '3' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
Signed-off-by: Fatih USTA <fatihusta86@gmail.com>
Refactored with cloudflare v4 library and also added some features and some code cleanup
Add basic Cloudflare Tunnel support
…/actions/attest-build-provenance-3 Bump actions/attest-build-provenance from 2 to 3
# Conflicts: # cloudflare.go # main.go # prometheus.go
![sentry[bot]](https://avatars.githubusercontent.com/in/12637?s=60&v=4){kind=small}
xyzjace
approved these changes
Nov 13, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
17 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge commits from upstream to allow us to track further improvements and contribute upstream.