Skip to content

Commit

Permalink
Merge branch 'release/0.0.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins committed Jul 19, 2022
2 parents 3ff6f4b + de22576 commit 9776aff
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
Export your favorite GitHub repositories to Prometheus

* Use it _as a service_: See https://gh.skuzzle.de for instructions
* Deploy it _on-premise_: `docker pull ghcr.io/skuzzle/gh-prom-exporter/gh-prom-exporter:0.0.10`
* Deploy it _on-premise_: `docker pull ghcr.io/skuzzle/gh-prom-exporter/gh-prom-exporter:0.0.11`

## On-Premise deployment with docker
This application can easily be run as a docker container in whatever environment you like:

```
docker run -p 8080:8080 \
-e WEB_ALLOWANONYMOUSSCRAPE=true \
ghcr.io/skuzzle/gh-prom-exporter/gh-prom-exporter:0.0.10
ghcr.io/skuzzle/gh-prom-exporter/gh-prom-exporter:0.0.11
```

With _anonymous scraping_ allowed, you can now easily view the scrape results directly in the browser by navigating to
Expand All @@ -38,7 +38,7 @@ scrape_configs:
In case you want to enforce authenticated scrapes only, use this configuration instead:
```
docker run -p 8080:8080 \
ghcr.io/skuzzle/gh-prom-exporter/gh-prom-exporter:0.0.10
ghcr.io/skuzzle/gh-prom-exporter/gh-prom-exporter:0.0.11
```

Scraping now requires a GitHub access token, otherwise the service will respond with 401/Unauthorized.
Expand Down
7 changes: 4 additions & 3 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

[![Coverage Status](https://coveralls.io/repos/github/skuzzle/gh-prom-exporter/badge.svg?branch=master)](https://coveralls.io/github/skuzzle/gh-prom-exporter?branch=master) [![Twitter Follow](https://img.shields.io/twitter/follow/skuzzleOSS.svg?style=social)](https://twitter.com/skuzzleOSS)

* Refactoring and improve internal documentation
* Upgrade to Spring-Boot 2.6.6 (coming from 2.6.3)
* Upgrade to Spring-Boot 2.7.1 (coming from 2.6.6)
* Upgrade to Spring-Cloud 2021.0.3 (coming from 2021.0.0-RC1)
* Fix typo in log message


```
docker pull ghcr.io/skuzzle/gh-prom-exporter/gh-prom-exporter:0.0.10
docker pull ghcr.io/skuzzle/gh-prom-exporter/gh-prom-exporter:0.0.11
```
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>de.skuzzle.ghpromexporter</groupId>
<artifactId>gh-prom-exporter</artifactId>
<version>0.0.10</version>
<version>0.0.11</version>

<name>gh-prom-exporter</name>
<description>Export GitHub repository metrics in prometheus format</description>
Expand All @@ -36,11 +36,11 @@
<docker.registry.name>ghcr.io</docker.registry.name>
<docker.image.name>${docker.registry.name}/${github.user}/${github.name}/${project.artifactId}</docker.image.name>

<spring-boot.version>2.6.6</spring-boot.version>
<spring-cloud.version>2021.0.0-RC1</spring-cloud.version>
<spring-boot.version>2.7.1</spring-boot.version>
<spring-cloud.version>2021.0.3</spring-cloud.version>
<guava.version>31.0.1-jre</guava.version>
<github-api.version>1.135</github-api.version>
<snapshottest.version>1.2.3</snapshottest.version>
<snapshottest.version>1.3.0</snapshottest.version>
</properties>

<repositories>
Expand Down
5 changes: 3 additions & 2 deletions readme/RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

[![Coverage Status](https://coveralls.io/repos/github/${github.user}/${github.name}/badge.svg?branch=${github.main-branch})](https://coveralls.io/github/${github.user}/${github.name}?branch=${github.main-branch}) [![Twitter Follow](https://img.shields.io/twitter/follow/skuzzleOSS.svg?style=social)](https://twitter.com/skuzzleOSS)

* Refactoring and improve internal documentation
* Upgrade to Spring-Boot 2.6.6 (coming from 2.6.3)
* Upgrade to Spring-Boot 2.7.1 (coming from 2.6.6)
* Upgrade to Spring-Cloud 2021.0.3 (coming from 2021.0.0-RC1)
* Fix typo in log message


```
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/de/skuzzle/ghpromexporter/web/AbuseLimiter.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public AbuseLimiter(Cache<InetAddress, Integer> abusers, int abuseLimit) {

/**
* Returns an empty optional if the abuse limit was hit. Otherwise the Mono will
* contain just a arbitrary object.
* contain just an arbitrary object.
*
* @param origin The origin IP to check.
* @return An empty Mono if the abuse limit was violated by that IP.
Expand All @@ -39,7 +39,7 @@ Mono<Object> blockAbusers(InetAddress origin) {
private boolean abuseLimitExceeded(InetAddress origin, int actualAbuses) {
if (actualAbuses >= abuseLimit) {
AppMetrics.abuses().increment();
log.warn("Abuse limit exceeded for IP address {}. Countet violations: {}", origin, actualAbuses);
log.warn("Abuse limit exceeded for IP address {}. Counted violations: {}", origin, actualAbuses);
return false;
}
return true;
Expand Down

0 comments on commit 9776aff

Please sign in to comment.