Merge pull request #183269 from flokli/grafana-agent-merge-defaults

nixos/grafana-agent: ensure defaults are merged

authored by Jörg Thalheim and committed by GitHub dfda4ec1 6c955361

+18 -4
+18 -4
nixos/modules/services/monitoring/grafana-agent.nix
··· 48 freeformType = settingsFormat.type; 49 }; 50 51 - default = { 52 metrics = { 53 - wal_directory = "\${STATE_DIRECTORY}"; 54 global.scrape_interval = "5s"; 55 }; 56 integrations = { ··· 59 node_exporter.enabled = true; 60 replace_instance_label = true; 61 }; 62 - }; 63 - 64 example = { 65 metrics.global.remote_write = [{ 66 url = "\${METRICS_REMOTE_WRITE_URL}"; ··· 104 }; 105 106 config = mkIf cfg.enable { 107 systemd.services.grafana-agent = { 108 wantedBy = [ "multi-user.target" ]; 109 script = ''
··· 48 freeformType = settingsFormat.type; 49 }; 50 51 + default = { }; 52 + defaultText = '' 53 metrics = { 54 + wal_directory = "\''${STATE_DIRECTORY}"; 55 global.scrape_interval = "5s"; 56 }; 57 integrations = { ··· 60 node_exporter.enabled = true; 61 replace_instance_label = true; 62 }; 63 + ''; 64 example = { 65 metrics.global.remote_write = [{ 66 url = "\${METRICS_REMOTE_WRITE_URL}"; ··· 104 }; 105 106 config = mkIf cfg.enable { 107 + services.grafana-agent.settings = { 108 + # keep this in sync with config.services.grafana-agent.settings.defaultText. 109 + metrics = { 110 + wal_directory = mkDefault "\${STATE_DIRECTORY}"; 111 + global.scrape_interval = mkDefault "5s"; 112 + }; 113 + integrations = { 114 + agent.enabled = mkDefault true; 115 + agent.scrape_integration = mkDefault true; 116 + node_exporter.enabled = mkDefault true; 117 + replace_instance_label = mkDefault true; 118 + }; 119 + }; 120 + 121 systemd.services.grafana-agent = { 122 wantedBy = [ "multi-user.target" ]; 123 script = ''