IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1576 from yabinmeng/rm-docker-metrics

Browse Source 
Fix the Prometheus Push metrics reporter authentication configuration issue
This commit is contained in:
Jonathan Shook 2023-09-29 17:27:13 -05:00 committed by GitHub
commit a50ccc3cac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nb-api/src/main/java/io/nosqlbench/api/engine/metrics/reporters/PromPushReporter.java
View File

@ -31,6 +31,7 @@ import java.net.http.HttpRequest;
import java.net.http.HttpRequest.BodyPublishers; import java.net.http.HttpRequest.BodyPublishers;
import java.net.http.HttpResponse; import java.net.http.HttpResponse;
import java.net.http.HttpResponse.BodyHandler; import java.net.http.HttpResponse.BodyHandler;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.time.Clock; import java.time.Clock;
import java.time.Duration; import java.time.Duration;
@ -98,15 +99,18 @@ public class PromPushReporter extends ScheduledReporter implements NBConfigurabl
bearerToken = null; bearerToken = null;
if (optionalApikeyfile.isPresent()) { if (optionalApikeyfile.isPresent()) {
keyfilePath = optionalApikeyfile.map(Path::of).orElseThrow(); keyfilePath = optionalApikeyfile.map(Path::of).orElseThrow();
logger.info("Reading Bearer Token from %s", keyfilePath); if (Files.isRegularFile(keyfilePath)) {
PromPushKeyFileReader keyfile = new PromPushKeyFileReader(keyfilePath); logger.info("Reading Bearer Token from %s", keyfilePath);
bearerToken = "Bearer " + keyfile.get(); PromPushKeyFileReader keyfile = new PromPushKeyFileReader(keyfilePath);
bearerToken = keyfile.get();
}
} else if (optionalApikey.isPresent()) { } else if (optionalApikey.isPresent()) {
bearerToken = "Bearer " + optionalApikey.get(); bearerToken = optionalApikey.get();
} }
needsAuth = (null != bearerToken); needsAuth = (null != bearerToken);
bearerToken = "Bearer " + bearerToken;
} }
@Override @Override
public synchronized void report( public synchronized void report(
SortedMap<String, Gauge> gauges, SortedMap<String, Gauge> gauges,