Merge pull request #33 from canonical/feature/scrape-timeout

add config option for metrics.global.scrape_timeout
canonical · Nov 23, 2023 · 687a545 · 687a545
2 parents 26f3916 + fe00923
commit 687a545
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/config.yaml b/config.yaml
@@ -10,3 +10,7 @@ options:
       Loki).
     type: boolean
     default: false
+  scrape-timeout-sec:
+    description: The global metrics scrape timeout (seconds).
+    type: int
+    default: 10
diff --git a/src/grafana_agent.py b/src/grafana_agent.py
@@ -650,6 +650,9 @@ def _generate_config(self) -> Dict[str, Any]:
             "integrations": self._integrations_config,
             "metrics": {
                 "wal_directory": "/tmp/agent/data",
+                "global": {
+                    "scrape_timeout": self.model.config.get("global_scrape_timeout"),
+                },
                 "configs": [
                     {
                         "name": "agent_scraper",