From 964bc985186418c5efa98652d54576acc48680f4 Mon Sep 17 00:00:00 2001 From: Woodpecker Date: Wed, 25 Jun 2025 14:15:39 +0000 Subject: [PATCH 1/7] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8802b9e..c610000 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.keycloak keycloak-event-metrics - 2.0.0 + 2.0.1-SNAPSHOT Keycloak Metrics Provides metrics for Keycloak user/admin events @@ -36,7 +36,7 @@ https://git.kokuwa.io/keycloak/keycloak-event-metrics scm:git:https://git.kokuwa.io/keycloak/keycloak-event-metrics.git scm:git:https://git.kokuwa.io/keycloak/keycloak-event-metrics.git - 2.0.0 + HEAD forgejo @@ -59,7 +59,7 @@ - 2025-06-25T14:15:09Z + 2025-06-25T14:15:39Z UTF-8 ISO-8859-1 From efb009aaef10866b5de1ae3e9f9be7ae900ec8aa Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 25 Jun 2025 19:44:59 +0200 Subject: [PATCH 2/7] Rename to `kokuwaio/keycloak-event-metrics` --- .woodpecker/deploy.yaml | 2 +- .woodpecker/dockerhub.yaml | 2 +- .woodpecker/release.yaml | 2 +- README.md | 10 +++++----- pom.xml | 1 - 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.woodpecker/deploy.yaml b/.woodpecker/deploy.yaml index 53976dc..a562c15 100644 --- a/.woodpecker/deploy.yaml +++ b/.woodpecker/deploy.yaml @@ -1,6 +1,6 @@ when: instance: ci.kokuwa.io - repo: keycloak/keycloak-event-metrics + repo: kokuwaio/keycloak-event-metrics event: [manual, push] branch: main path: [.woodpecker/deploy.yaml, Dockerfile, pom.xml, src/main/**] diff --git a/.woodpecker/dockerhub.yaml b/.woodpecker/dockerhub.yaml index a443560..df265b7 100644 --- a/.woodpecker/dockerhub.yaml +++ b/.woodpecker/dockerhub.yaml @@ -1,6 +1,6 @@ when: instance: ci.kokuwa.io - repo: keycloak/keycloak-event-metrics + repo: kokuwaio/keycloak-event-metrics event: [manual, push] branch: main path: [.woodpecker/dockerhub.yaml, README.md] diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index 8ec3522..5d560ab 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -1,6 +1,6 @@ when: instance: ci.kokuwa.io - repo: keycloak/keycloak-event-metrics + repo: kokuwaio/keycloak-event-metrics event: deployment branch: main diff --git a/README.md b/README.md index cd59d4d..e0802e1 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ Provides metrics for Keycloak user/admin events and user/client/session count. T [![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.keycloak/keycloak-event-metrics.svg?label=Maven%20Central)](https://central.sonatype.com/search?namespace=io.kokuwa.keycloak&q=keycloak-event-metrics) [![pulls](https://img.shields.io/docker/pulls/kokuwaio/keycloak-event-metrics)](https://hub.docker.com/r/kokuwaio/keycloak-event-metrics) [![size](https://img.shields.io/docker/image-size/kokuwaio/keycloak-event-metrics)](https://hub.docker.com/r/kokuwaio/keycloak-event-metrics) -[![dockerfile](https://img.shields.io/badge/source-Dockerfile%20-blue)](https://git.kokuwa.io/keycloak/keycloak-event-metrics/src/branch/main/Dockerfile) -[![license](https://img.shields.io/badge/License-EUPL%201.2-blue)](https://git.kokuwa.io/keycloak/keycloak-event-metrics/src/branch/main/LICENSE) -[![prs](https://img.shields.io/gitea/pull-requests/open/keycloak/keycloak-event-metrics?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/keycloak/keycloak-event-metrics/pulls) -[![issues](https://img.shields.io/gitea/issues/open/keycloak/keycloak-event-metrics?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/keycloak/keycloak-event-metrics/issues) -[![build](https://ci.kokuwa.io/api/badges/keycloak/keycloak-event-metrics/status.svg)](https://ci.kokuwa.io/repos/keycloak/keycloak-event-metrics/) +[![dockerfile](https://img.shields.io/badge/source-Dockerfile%20-blue)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/src/branch/main/Dockerfile) +[![license](https://img.shields.io/badge/License-EUPL%201.2-blue)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/src/branch/main/LICENSE) +[![prs](https://img.shields.io/gitea/pull-requests/open/kokuwaio/keycloak-event-metrics?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/pulls) +[![issues](https://img.shields.io/gitea/issues/open/kokuwaio/keycloak-event-metrics?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/issues) +[![build](https://ci.kokuwa.io/api/badges/kokuwaio/keycloak-event-metrics/status.svg)](https://ci.kokuwa.io/repos/kokuwaio/keycloak-event-metrics/) ## Why? diff --git a/pom.xml b/pom.xml index c610000..30c1b44 100644 --- a/pom.xml +++ b/pom.xml @@ -506,7 +506,6 @@ central-publishing-maven-plugin true - true sonatype.org true published From 4c5e97e0de37b13d20dc5121be259c0d744752a0 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Wed, 25 Jun 2025 20:40:06 +0200 Subject: [PATCH 3/7] Add Github README. --- .github/README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/README.md diff --git a/.github/README.md b/.github/README.md new file mode 100644 index 0000000..662ce3d --- /dev/null +++ b/.github/README.md @@ -0,0 +1,14 @@ +# Keycloak Metrics + +Provides metrics for Keycloak user/admin events and user/client/session count. Tested on Keycloak [22-26](.woodpecker/verify.yaml#L7-L11). + +[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.keycloak/keycloak-event-metrics.svg?label=Maven%20Central)](https://central.sonatype.com/search?namespace=io.kokuwa.keycloak&q=keycloak-event-metrics) +[![pulls](https://img.shields.io/docker/pulls/kokuwaio/keycloak-event-metrics)](https://hub.docker.com/r/kokuwaio/keycloak-event-metrics) +[![size](https://img.shields.io/docker/image-size/kokuwaio/keycloak-event-metrics)](https://hub.docker.com/r/kokuwaio/keycloak-event-metrics) +[![dockerfile](https://img.shields.io/badge/source-Dockerfile%20-blue)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/src/branch/main/Dockerfile) +[![license](https://img.shields.io/badge/License-EUPL%201.2-blue)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/src/branch/main/LICENSE) +[![prs](https://img.shields.io/gitea/pull-requests/open/kokuwaio/keycloak-event-metrics?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/pulls) +[![issues](https://img.shields.io/gitea/issues/open/kokuwaio/keycloak-event-metrics?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/issues) +[![build](https://ci.kokuwa.io/api/badges/kokuwaio/keycloak-event-metrics/status.svg)](https://ci.kokuwa.io/repos/kokuwaio/keycloak-event-metrics/) + +For more documention see: [git.kokuwa.io/kokuwaio/keycloak-event-metrics](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics) From ad4604e5a85f59618a2eba2e5d196ccf094c00f9 Mon Sep 17 00:00:00 2001 From: Renovate Date: Thu, 26 Jun 2025 03:03:26 +0000 Subject: [PATCH 4/7] chore(deps): update dependency net.revelc.code.formatter:formatter-maven-plugin from 2.26.0 to 2.27.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30c1b44..96f8bce 100644 --- a/pom.xml +++ b/pom.xml @@ -301,7 +301,7 @@ net.revelc.code.formatter formatter-maven-plugin - 2.26.0 + 2.27.0 ${formatter.configFile} From 9277ad3afcf6f0e8830a736b3a82752f319adacf Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Thu, 26 Jun 2025 21:25:10 +0200 Subject: [PATCH 5/7] chore: fix repo urls in `pom.xml` --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 96f8bce..ea2dea8 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ Keycloak Metrics Provides metrics for Keycloak user/admin events - https://git.kokuwa.io/keycloak/keycloak-event-metrics + https://git.kokuwa.io/kokuwaio/keycloak-event-metrics 2023 Kokuwa.io @@ -33,18 +33,18 @@ - https://git.kokuwa.io/keycloak/keycloak-event-metrics - scm:git:https://git.kokuwa.io/keycloak/keycloak-event-metrics.git - scm:git:https://git.kokuwa.io/keycloak/keycloak-event-metrics.git + https://git.kokuwa.io/kokuwaio/keycloak-event-metrics + scm:git:https://git.kokuwa.io/kokuwaio/keycloak-event-metrics.git + scm:git:https://git.kokuwa.io/kokuwaio/keycloak-event-metrics.git HEAD forgejo - https://git.kokuwa.io/keycloak/keycloak-event-metrics/issues + https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/issues woodpecker - https://ci.kokuwa.io/repos/keycloak/keycloak-event-metrics + https://ci.kokuwa.io/repos/kokuwaio/keycloak-event-metrics @@ -454,7 +454,7 @@ - + org.apache.maven.plugins maven-source-plugin From cafd9647007e2f2caedd27d82f636f8cdc13feba Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Fri, 27 Jun 2025 11:38:37 +0200 Subject: [PATCH 6/7] chore: fix renovate preset location --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index dc88820..c59fb01 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,5 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["local>infrastructure/renovate-config", ":reviewer(stephan.schnabel)"], + "extends": ["local>kokuwaio/renovate-config", ":reviewer(stephan.schnabel)"], "pinDigests": false } From beb356e75f76cb20def0e1744ba5f2065b2be03d Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Fri, 27 Jun 2025 21:01:24 +0200 Subject: [PATCH 7/7] chore: remove github actions --- .github/README.md | 6 +++--- .github/workflows/build.yaml | 42 ------------------------------------ .github/workflows/lint.yaml | 23 -------------------- .woodpecker/deploy.yaml | 13 ++++++++++- .woodpecker/dockerhub.yaml | 17 --------------- .yamllint.yaml | 4 ---- README.md | 6 +++--- 7 files changed, 18 insertions(+), 93 deletions(-) delete mode 100644 .github/workflows/build.yaml delete mode 100644 .github/workflows/lint.yaml delete mode 100644 .woodpecker/dockerhub.yaml diff --git a/.github/README.md b/.github/README.md index 662ce3d..b95b40f 100644 --- a/.github/README.md +++ b/.github/README.md @@ -2,13 +2,13 @@ Provides metrics for Keycloak user/admin events and user/client/session count. Tested on Keycloak [22-26](.woodpecker/verify.yaml#L7-L11). -[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.keycloak/keycloak-event-metrics.svg?label=Maven%20Central)](https://central.sonatype.com/search?namespace=io.kokuwa.keycloak&q=keycloak-event-metrics) +[![maven](https://img.shields.io/maven-central/v/io.kokuwa.keycloak/keycloak-event-metrics.svg?label=maven)](https://central.sonatype.com/artifact/io.kokuwa.keycloak/keycloak-event-metrics) [![pulls](https://img.shields.io/docker/pulls/kokuwaio/keycloak-event-metrics)](https://hub.docker.com/r/kokuwaio/keycloak-event-metrics) [![size](https://img.shields.io/docker/image-size/kokuwaio/keycloak-event-metrics)](https://hub.docker.com/r/kokuwaio/keycloak-event-metrics) [![dockerfile](https://img.shields.io/badge/source-Dockerfile%20-blue)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/src/branch/main/Dockerfile) -[![license](https://img.shields.io/badge/License-EUPL%201.2-blue)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/src/branch/main/LICENSE) -[![prs](https://img.shields.io/gitea/pull-requests/open/kokuwaio/keycloak-event-metrics?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/pulls) +[![license](https://img.shields.io/badge/license-EUPL%201.2-blue)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/src/branch/main/LICENSE) [![issues](https://img.shields.io/gitea/issues/open/kokuwaio/keycloak-event-metrics?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/issues) +[![prs](https://img.shields.io/gitea/pull-requests/open/kokuwaio/keycloak-event-metrics?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/pulls) [![build](https://ci.kokuwa.io/api/badges/kokuwaio/keycloak-event-metrics/status.svg)](https://ci.kokuwa.io/repos/kokuwaio/keycloak-event-metrics/) For more documention see: [git.kokuwa.io/kokuwaio/keycloak-event-metrics](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml deleted file mode 100644 index 5d30921..0000000 --- a/.github/workflows/build.yaml +++ /dev/null @@ -1,42 +0,0 @@ -name: Verify - -on: - - pull_request - - push: - branches: [main] - -env: - MAVEN_ARGS: --batch-mode --color=always --no-transfer-progress - -jobs: - - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - - uses: actions/setup-java@main - with: - distribution: temurin - java-version: 17 - cache: maven - - run: mvn verify - - versions: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - version: - - 22.0.5 - - 23.0.7 - - 24.0.5 - - 25.0.6 - - 26.2.5 - steps: - - uses: actions/checkout@main - - uses: actions/setup-java@main - with: - distribution: temurin - java-version: 17 - cache: maven - - run: mvn verify -Dversion.org.keycloak.test=${{ matrix.version }} diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml deleted file mode 100644 index af980fa..0000000 --- a/.github/workflows/lint.yaml +++ /dev/null @@ -1,23 +0,0 @@ -name: Lint - -on: push - -jobs: - - renovate: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - - uses: docker://kokuwaio/renovate-config-validator - - markdownlint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - - uses: docker://kokuwaio/markdownlint - - yamllint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - - uses: docker://kokuwaio/yamllint diff --git a/.woodpecker/deploy.yaml b/.woodpecker/deploy.yaml index a562c15..7916e19 100644 --- a/.woodpecker/deploy.yaml +++ b/.woodpecker/deploy.yaml @@ -3,7 +3,7 @@ when: repo: kokuwaio/keycloak-event-metrics event: [manual, push] branch: main - path: [.woodpecker/deploy.yaml, Dockerfile, pom.xml, src/main/**] + path: [.woodpecker/deploy.yaml, README.md, Dockerfile, pom.xml, src/main/**] services: - name: dockerd @@ -48,3 +48,14 @@ steps: org.opencontainers.image.licenses: EUPL-1.2 org.opencontainers.image.ref.name: kokuwaio/keycloak-event-metrics org.opencontainers.image.version: snapshot + + dockerhub: + image: kokuwaio/dockerhub-metadata + settings: + repository: kokuwaio/keycloak-event-metrics + description-short: Provides metrics for Keycloak user/admin events and user/client/session count. + categories: monitoring-and-observability + username: {from_secret: dockerhub_username} + password: {from_secret: dockerhub_password} + when: + path: [README.md] diff --git a/.woodpecker/dockerhub.yaml b/.woodpecker/dockerhub.yaml deleted file mode 100644 index df265b7..0000000 --- a/.woodpecker/dockerhub.yaml +++ /dev/null @@ -1,17 +0,0 @@ -when: - instance: ci.kokuwa.io - repo: kokuwaio/keycloak-event-metrics - event: [manual, push] - branch: main - path: [.woodpecker/dockerhub.yaml, README.md] - -steps: - - metadata: - image: kokuwaio/dockerhub-metadata - settings: - repository: kokuwaio/keycloak-event-metrics - description-short: Provides metrics for Keycloak user/admin events and user/client/session count. - categories: monitoring-and-observability - username: {from_secret: dockerhub_username} - password: {from_secret: dockerhub_password} diff --git a/.yamllint.yaml b/.yamllint.yaml index 8011808..21966f2 100644 --- a/.yamllint.yaml +++ b/.yamllint.yaml @@ -13,7 +13,3 @@ rules: quoted-strings: quote-type: double required: only-when-needed - - # allow everything on keys - truthy: - check-keys: false diff --git a/README.md b/README.md index e0802e1..b7d0bb0 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ Provides metrics for Keycloak user/admin events and user/client/session count. Tested on Keycloak [22-26](.woodpecker/verify.yaml#L7-L11). -[![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.keycloak/keycloak-event-metrics.svg?label=Maven%20Central)](https://central.sonatype.com/search?namespace=io.kokuwa.keycloak&q=keycloak-event-metrics) +[![maven](https://img.shields.io/maven-central/v/io.kokuwa.keycloak/keycloak-event-metrics.svg?label=maven)](https://central.sonatype.com/artifact/io.kokuwa.keycloak/keycloak-event-metrics) [![pulls](https://img.shields.io/docker/pulls/kokuwaio/keycloak-event-metrics)](https://hub.docker.com/r/kokuwaio/keycloak-event-metrics) [![size](https://img.shields.io/docker/image-size/kokuwaio/keycloak-event-metrics)](https://hub.docker.com/r/kokuwaio/keycloak-event-metrics) [![dockerfile](https://img.shields.io/badge/source-Dockerfile%20-blue)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/src/branch/main/Dockerfile) -[![license](https://img.shields.io/badge/License-EUPL%201.2-blue)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/src/branch/main/LICENSE) -[![prs](https://img.shields.io/gitea/pull-requests/open/kokuwaio/keycloak-event-metrics?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/pulls) +[![license](https://img.shields.io/badge/license-EUPL%201.2-blue)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/src/branch/main/LICENSE) [![issues](https://img.shields.io/gitea/issues/open/kokuwaio/keycloak-event-metrics?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/issues) +[![prs](https://img.shields.io/gitea/pull-requests/open/kokuwaio/keycloak-event-metrics?gitea_url=https%3A%2F%2Fgit.kokuwa.io)](https://git.kokuwa.io/kokuwaio/keycloak-event-metrics/pulls) [![build](https://ci.kokuwa.io/api/badges/kokuwaio/keycloak-event-metrics/status.svg)](https://ci.kokuwa.io/repos/kokuwaio/keycloak-event-metrics/) ## Why?