Skip to content

Commit 0ae9eaa

Browse files
committed
fix tiny mistakes in readmes and resources + update workflow
1 parent 74e1d08 commit 0ae9eaa

5 files changed

Lines changed: 12 additions & 8 deletions

File tree

.github/workflows/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ jobs:
9292
with:
9393
path: build/libs/*.*
9494

95+
- name: Create info file
96+
run: |
97+
echo -e "ref: $GITHUB_REF \ncommit: $GITHUB_SHA\nbuild: $(date +"%Y-%m-%dT%H:%M:%SZ")" > build/libs/info.txt
98+
9599
- name: Update nightly release
96100
uses: eine/tip@master
97101
with:

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ This repository is the cornerstone of BBData. It contains:
2929
* [Changing exposed actuators](#changing-exposed-actuators)
3030
- [Monitoring](#monitoring)
3131
* [Spring Boot Admin](#spring-boot-admin)
32-
* [Prometheus + Graffana](#prometheus---graffana)
32+
* [Prometheus + Grafana](#prometheus---grafana)
3333

3434
## Development setup
3535

@@ -429,7 +429,7 @@ There are two (complementary?) supported monitoring systems:
429429

430430
* [Spring Boot Admin](https://codecentric.github.io/spring-boot-admin/2.3.0/),
431431
which lets you interact with the actuators from a UI (clear the cache, change logging levels, etc.);
432-
* [Prometheus](https://prometheus.io/) + [Graffana](https://grafana.com/),
432+
* [Prometheus](https://prometheus.io/) + [Grafana](https://grafana.com/),
433433
which lets you graph and monitor different metrics.
434434

435435
### Spring Boot Admin
@@ -457,7 +457,7 @@ spring.boot.admin.client.url=<URL OF THE ADMIN SERVER>
457457
spring.boot.admin.client.instance.name=BBData test Instance
458458
````
459459

460-
### Prometheus + Graffana
460+
### Prometheus + Grafana
461461

462462
The BBData API ships with `io.micrometer:micrometer-registry-prometheus`.
463463
If the property `management.endpoint.prometheus.enabled=true` and `prometheus` is exposed (see `management.endpoints.web.exposure.include`),

other/jmeter/local.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ threads_about=2
2626
# ...for GET /objects/{id}/latest
2727
threads_get_latest=4
2828

29-
# time between each request, in seconds
30-
period=0.1
29+
# sleep between each request, in milliseconds
30+
period=100
3131
# duration of the test, in seconds
3232
duration=180
3333

other/monitoring/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ For all metrics of type *summary* (such as `http_server_requests_seconds_*`), we
7474
* `_sum`: the sum of all the records made during a time window.
7575
For http requests, it means the total duration of every request for each endpoint;
7676

77-
We can work with those summaries in Prometheus/Graffana using common approaches:
77+
We can work with those summaries in Prometheus/Grafana using common approaches:
7878

7979
* Average latency: `rate(timer_sum[10s])/rate(timer_count[10s])`
8080
* Throughput (requests per second): `rate(timer_count[10s])`

other/monitoring/config/prometheus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# my global config
22
global:
3-
scrape_interval: 15s # Set the scrape interval to every 15 seconds. Default is every 1 minute.
4-
evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute.
3+
scrape_interval: 15s # Set the scrape interval to every [duration]. Default is every 1 minute.
4+
evaluation_interval: 15s # Evaluate rules every [duration]. The default is every 1 minute.
55
# scrape_timeout is set to the global default (10s).
66

77
# Load rules once and periodically evaluate them according to the global 'evaluation_interval'.

0 commit comments

Comments
 (0)