Skip to content

Commit 7f4d3c4

Browse files
author
Tim Middleton
committed
Address reveiw comments
1 parent 3bfab28 commit 7f4d3c4

File tree

3 files changed

+11
-899
lines changed

3 files changed

+11
-899
lines changed

hols/grafana/README.md

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ In this lab you will:
1515
2. The `helidon` CLI ([installation](https://helidon.io/docs/v4/about/cli))
1616
3. Grafana ([installation](https://grafana.com/docs/grafana/latest/setup-grafana/installation/))
1717
4. Prometheus ([installation](https://prometheus.io/docs/prometheus/latest/installation/))
18-
5. Loki ([installation](https://grafana.com/docs/loki/latest/setup/install/)
19-
6. Promtail ([installation](https://grafana.com/docs/loki/latest/send-data/promtail/installation/)
18+
5. Loki ([installation](https://grafana.com/docs/loki/latest/setup/install/))
19+
6. Promtail ([installation](https://grafana.com/docs/loki/latest/send-data/promtail/installation/))
2020
7. Clone this GitHub repository - https://github.com/helidon-io/helidon-labs
2121

2222
> Note: Optionally you can use JDK24 to show experimental virtual threads metrics.
2323
24-
On MacOS you should be able to install the above using `brew`.
24+
On macOS, you should be able to install the above using `brew`.
2525

2626
This lab was tested with:
2727
* Grafana 11.6.0
@@ -82,7 +82,7 @@ Next build and run the application:
8282
```shell
8383
cd quickstart-mp
8484
mvn clean install
85-
java -Xmx1g -Xmx1g -jar target/quickstart-mp.jar
85+
java -Xmx1g -Xms1g -jar target/quickstart-mp.jar
8686
```
8787

8888
Congratulations! You have a Helidon service up and running. It will be listening on port 8080. Try it in another terminal:
@@ -110,7 +110,7 @@ Next build and run the SE application:
110110
```shell
111111
cd quickstart-se
112112
mvn clean install
113-
java -Xmx256m -Xmx256m -Dserver.port=8082 -jar target/quickstart-se.jar
113+
java -Xmx256m -Xms256m -Dserver.port=8082 -jar target/quickstart-se.jar
114114
```
115115

116116
Congratulations! You have a Helidon SE service up and running. It will be listening on port 8082. Try it in another terminal:
@@ -148,7 +148,7 @@ Then, include the following in each of the generated MP and SE `pom.xml`.
148148
## Add application identification to metrics
149149

150150
To ensure we can identify individual helidon applications as well as allowing drill-through, we need to add the
151-
following labels to your generated metrics using the system property or `META-INF/application.yaml` (SE) or `META-INF/microprofile-config.properties` (MP)
151+
following labels to your generated metrics using the system property or `src/main/resources/application.yaml` (SE) or `META-INF/microprofile-config.properties` (MP)
152152

153153
### Helidon MP
154154

@@ -168,7 +168,7 @@ Change the existing value of `metrics.rest-request.enabled` to `true`.
168168

169169
### Helidon SE
170170

171-
Add the following to your `META-INF/application.yaml` in the `quickstart-se` application to identify the application and enable additional metrics.
171+
Add the following to your `src/main/resources/application.yaml` in the `quickstart-se` application to identify the application and enable additional metrics.
172172

173173
*application.yaml*
174174
```yaml
@@ -268,7 +268,7 @@ the access log files from `${HOME}/logs/helidon-quickstart-mp/` and send them to
268268
Next, start the monitoring stack. Create four terminal windows and start each of
269269
these in the foreground so you can easily see what they are doing.
270270

271-
These commands are based on the default install locations of `brew` on MacOS. You should adjust these commands
271+
These commands are based on the default install locations of `brew` on macOS. You should adjust these commands
272272
to match your environment.
273273

274274
```shell
@@ -428,10 +428,9 @@ java -Xmx256m -Xmx256m -Dserver.port=8083 -jar target/quickstart-se.jar
428428

429429
If you wish to explore the Loki logs you can do the following in Grafana:
430430

431-
1. Open the Grafana menu at the top left, and click on `Explore`
432-
2. Select the `Loki` datasource
433-
3. On the right click, `Code`, and enter the following in the query and click `Run Query`
434-
`{job="helidon-quickstart-mp"}`
431+
1. Open the Grafana menu at the top left, and click on `Drill Down`
432+
2. Select `Logs`
433+
3. In the labels, select `job` then select `helidon-quickstart-mp`, and click `Show Logs`
435434
4. You should see something similar to the following showing the collected logs:
436435
![grafana-loki.png](./images/grafana-loki.png)
437436

0 commit comments

Comments
 (0)