[pull] master from jenkinsci:master

.github/ISSUE_TEMPLATE.md

@@ -28,4 +28,4 @@ Tell us what happens instead
 
 ### Notify
 
-@markyjackson-taulia
+@Waschndolos

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,4 +14,4 @@ Fixes #...
 
 ### Notify
 
-@markyjackson-taulia
+@Waschndolos

.github/dependabot.yml

@@ -9,5 +9,5 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
     open-pull-requests-limit: 10

.github/release-drafter.yml

@@ -1,3 +1 @@
 _extends: .github
-tag-template: prometheus-$NEXT_PATCH_VERSION
-version-template: $MAJOR.$MINOR.$PATCH

.github/workflows/cd.yaml

@@ -0,0 +1,20 @@
+# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins
+
+name: cd
+on:
+  workflow_dispatch:
+# Want to do manual releases for now until I'm used to the CD
+#  check_run:
+#    types:
+#      - completed
+
+permissions:
+  checks: read
+  contents: write
+
+jobs:
+  maven-cd:
+    uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1
+    secrets:
+      MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+      MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}

.github/workflows/jenkins-security-scan.yml

@@ -0,0 +1,21 @@
+name: Jenkins Security Scan
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+  workflow_dispatch:
+
+permissions:
+  security-events: write
+  contents: read
+  actions: read
+
+jobs:
+  security-scan:
+    uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
+    with:
+      java-cache: 'maven' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
+      # java-version: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v3
+    - uses: actions/stale@v9.1.0
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'Stale issue message'

.gitignore

@@ -7,4 +7,5 @@ work
 .classpath
 .settings/
 build/
-*.DS_Store
+*.DS_Store
+.vscode/*

.mvn/extensions.xml

@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.8</version>
+  </extension>
+</extensions>

.mvn/maven.config

@@ -0,0 +1,3 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals
+-Dchangelist.format=%d.v%s

Jenkinsfile

@@ -1,2 +1,10 @@
 /* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
-buildPlugin()
+
+buildPlugin(
+  forkCount: '1C', 
+  useContainerAgent: true, 
+  configurations: [
+    [platform: 'linux', jdk: 25],
+    [platform: 'windows', jdk: 25],
+    [platform: 'linux', jdk: 21],
+])

README.md

@@ -1,21 +1,36 @@
 # Jenkins Prometheus Metrics Plugin
 
+[![Coverage](https://ci.jenkins.io/job/Plugins/job/prometheus-plugin/job/master/badge/icon?status=${instructionCoverage}&subject=coverage&color=${colorInstructionCoverage})](https://ci.jenkins.io/job/Plugins/job/prometheus-plugin/job/master)
+[![LOC](https://ci.jenkins.io/job/Plugins/job/prometheus-plugin/job/master/badge/icon?job=test&status=${lineOfCode}&subject=line%20of%20code&color=blue)](https://ci.jenkins.io/job/Plugins/job/prometheus-plugin/job/master)
+[![Jenkins Plugin Installs](https://img.shields.io/jenkins/plugin/i/prometheus.svg?color=blue)](https://plugins.jenkins.io/prometheus)
+
+
 ## About
-Jenkins Prometheus Plugin expose an endpoint (default `/prometheus`) with metrics where a Prometheus Server can scrape.
+Jenkins Prometheus Plugin expose an endpoint (default `/prometheus/`) with metrics where a Prometheus Server can scrape.
 
 Documentation can be found [here](https://plugins.jenkins.io/prometheus)
 
 Please note that the documentation is a WIP.
 
 ## Metrics exposed
-Currently only metrics from the [Metrics-plugin](https://github.com/jenkinsci/metrics-plugin) and summary of build
-duration of jobs and pipeline stages
+2 types of metrics are exposed:
+
+- Metrics from [Metrics-plugin](https://github.com/jenkinsci/metrics-plugin)
+- Metrics from this plugin. Refer [Prometheus-plugin](docs/metrics/index.md)
+
+## Scraping the endpoint
+The endpoint you've configured or the default endpoint `/prometheus/` in case you didn't configure an endpoint, needs to 
+end with a trailing slash when you configure the endpoint in your scraping tool. If you miss adding the trailing slash
+you'll get a 302 response with a redirection to the endpoint ending with a slash. Some tools cannot handle this well.
+
+## Configuring the plugin
+You can find some examples in this documentation [Configuring Plugin](docs/configuration/configuration.md)
 
 ## Environment variables
 
 `PROMETHEUS_NAMESPACE` Prefix of metric (Default: `default`).
 
-`PROMETHEUS_ENDPOINT` REST Endpoint (Default: `prometheus`)
+`PROMETHEUS_ENDPOINT` REST Endpoint (Default: `/prometheus/`)
 
 `COLLECTING_METRICS_PERIOD_IN_SECONDS` Async task period in seconds (Default: `120` seconds)
 
@@ -28,9 +43,8 @@ duration of jobs and pipeline stages
     mvn hpi:hpi
 
 ## Author / Maintainer
-[Lars Sjöström](https://github.com/lsjostro)
 
-[Marky Jackson](https://github.com/markyjackson-taulia)
+[Waschndolos](https://github.com/waschndolos)
 
 # Contributing
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.
@@ -89,9 +103,11 @@ Have a look at CONTRIBUTING.md. There are 3 easy ways to contribute to this proj
 
 Commit and push your changes.
 
+```
 git add -A 
 git commit -m "Your commit message"
 git push --set-upstream origin new-branch
+```
 Create a Pull Request by navigating to your forked repository and clicking the New pull request button on your left-hand side of the page.
 
 Add in a title, edit the PR template, and then press the Create pull request button.

docs/configuration/configuration.md

@@ -0,0 +1,76 @@
+# Plugin configuration
+
+## Path
+With the path configuration you can configure under which url the Prometheus page will be rendered. The default
+is `prometheus` which will cause the rending to be at `http(s)://yourInstance:(port)/(jenkins?)/prometheus`
+
+## Default Namespace
+You can configure a namespace for all metrics generated by this plugin which will be prefixed to the output
+
+## Enable authentication for prometheus end-point
+If you check this the accessing the endpoint needs to have the `Metrics.VIEW` permission
+
+## Collecting metrics period in second
+The metrics are collected every x seconds. You can configure the interval here.
+
+## Count duration of successful builds
+If checked the plugin wil calculate the duration of successful builds
+
+## Count duration of unstable builds
+If checked the plugin wil calculate the duration of unstable builds
+
+## Count duration of not-built builds
+If checked the plugin wil calculate the duration of not-built builds
+
+## Count duration of aborted builds
+If checked the plugin wil calculate the duration of aborted builds
+
+## Fetch the test results of builds
+If checked the plugin will return test results as metrics
+
+## Add build parameter label to metrics
+If checked the plugin will add the build (input) parameters to the metrics. 
+Note:  If the cardinality of your build parameters is high, this will create a large number of metrics. 
+This can result in poor jenkins and prometheus performance.
+
+## Add build status label to metrics
+If checked the plugin will add the build status like SUCCESS, FAILURE, RUNNING to the metrics of
+`duration_milliseconds_summary`, `success_build_count` and `failed_build_count metrics`
+
+## Job attribute name
+You can configure the label of the field which contains the job name here.
+
+## Build parameters that will be added as separate labels to metrics
+Please refer online documentation (question mark symbol in jenkins configuration page)
+
+## Collect disk usage
+If checked the plugin will collect the disk usage of your master agent. Do not use this on a cloud storage provider.
+
+## Collect node status
+If checked the plugin will collect data of up/down status of your Jenkins agents
+
+## Collect metrics for each run per build
+If checked it will cause the plugin to add metrics for every build available. The build number will be added as label. Use with caution!
+
+## Collect Code coverage  (since v2.3.0)
+If checked and you publish your code coverage results with [https://plugins.jenkins.io/coverage](https://plugins.jenkins.io/coverage)
+the plugin will output metrics for: 
+* (Class | Branch | Instruction | File | Line ) Missed
+* (Class | Branch | Instruction | File | Line ) Covered
+* (Class | Branch | Instruction | File | Line ) Total
+* (Class | Branch | Instruction | File | Line ) Percent
+
+## Disable Metrics (since v2.3.0)
+Sometimes you don't need all metrics in your prometheus endpoint which this plugin provides. 
+You can disable certain metrics. These metrics are not being collected by the plugin and therefore not added in the 
+prometheus endpoint.
+
+![img.png](img/disabled_metrics.png)
+
+### Regex Entry
+A Regex entry can be used to disable a group of metrics. E.g. if you want to disable everything with 
+default_jenkins_disk.*
+
+### Fully qualified Name Entry
+If you want to disable certain individual entries you can do it with this entry. The value should be the same
+as you can see it in the prometheus endpoint. It's case-insensitive.