gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #178224 from flokli/grafana-agent-module-fixes

Browse Source 
nixos/grafana-agent: apply some fixes
This commit is contained in:
Jonas Chevalier
2022-06-19 12:38:43 +02:00
committed by GitHub
parent 9b24aab6a3 8b926cad93
commit c858c17c85
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/monitoring/grafana-agent.nix
+8 -17
View File
@@ -7,7 +7,7 @@ let
in
{
meta = {
maintainers = with maintainers; [ zimbatm ];
maintainers = with maintainers; [ flokli zimbatm ];
};
options.services.grafana-agent = {
@@ -49,14 +49,7 @@ in
};
default = {
server = {
# Don't bind on 0.0.0.0
grpc_listen_address = "127.0.0.1";
http_listen_address = "127.0.0.1";
# Don't bind on the default port 80
http_listen_port = 9090;
};
prometheus = {
metrics = {
wal_directory = "\${STATE_DIRECTORY}";
global.scrape_interval = "5s";
};
@@ -69,7 +62,12 @@ in
};
example = {
loki.configs = [{
metrics.global.remote_write = [{
url = "\${METRICS_REMOTE_WRITE_URL}";
basic_auth.username = "\${METRICS_REMOTE_WRITE_USERNAME}";
basic_auth.password_file = "\${CREDENTIALS_DIRECTORY}/metrics_remote_write_password";
}];
logs.configs = [{
name = "default";
scrape_configs = [
{
@@ -101,13 +99,6 @@ in
basic_auth.password_file = "\${CREDENTIALS_DIRECTORY}/logs_remote_write_password";
}];
}];
integrations = {
prometheus_remote_write = [{
url = "\${METRICS_REMOTE_WRITE_URL}";
basic_auth.username = "\${METRICS_REMOTE_WRITE_USERNAME}";
basic_auth.password_file = "\${CREDENTIALS_DIRECTORY}/metrics_remote_write_password";
}];
};
};
};
};
nixos/tests/grafana-agent.nix
+2 -2
View File
@@ -23,9 +23,9 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
with subtest("Grafana-agent is running"):
machine.wait_for_unit("grafana-agent.service")
machine.wait_for_open_port(9090)
machine.wait_for_open_port(12345)
machine.succeed(
"curl -sSfN http://127.0.0.1:9090/-/healthy"
"curl -sSfN http://127.0.0.1:12345/-/healthy"
)
machine.shutdown()
'';