Skip to content

Add prometheus stat source#5259

Closed
HofiOne wants to merge 35 commits intosyslog-ng:developfrom
HofiOne:add-prometheus-stat-source
Closed

Add prometheus stat source#5259
HofiOne wants to merge 35 commits intosyslog-ng:developfrom
HofiOne:add-prometheus-stat-source

Conversation

@HofiOne
Copy link
Collaborator

@HofiOne HofiOne commented Mar 12, 2025

No description provided.

HofiOne added 6 commits March 12, 2025 13:40
…er validation, sub-commands and options do not need to be double validated

Signed-off-by: Hofi <[email protected]>
…ndlers that refers to further parameter parsing issues

Signed-off-by: Hofi <[email protected]>
…ommand, but keep the legacy sub-command version as well to be backward compatible

Signed-off-by: Hofi <[email protected]>
…y` command

Using now the automatic GLib Commandline Option Parser validation

Signed-off-by: Hofi <[email protected]>
@kira-syslogng
Copy link
Contributor

Build FAILURE

@HofiOne HofiOne force-pushed the add-prometheus-stat-source branch from 6806185 to 5e48930 Compare March 12, 2025 16:03
@kira-syslogng
Copy link
Contributor

Build FAILURE

@HofiOne HofiOne force-pushed the add-prometheus-stat-source branch from 5e48930 to 808ff41 Compare March 12, 2025 16:19
@kira-syslogng
Copy link
Contributor

Build FAILURE

@HofiOne
Copy link
Collaborator Author

HofiOne commented Mar 12, 2025

@kira-syslogng test this please;

@kira-syslogng
Copy link
Contributor

Build FAILURE

@syslog-ng syslog-ng deleted a comment from github-actions bot Mar 12, 2025
@HofiOne HofiOne force-pushed the add-prometheus-stat-source branch from 808ff41 to 44addd8 Compare March 12, 2025 18:30
@kira-syslogng
Copy link
Contributor

Build FAILURE

@HofiOne HofiOne force-pushed the add-prometheus-stat-source branch from 44addd8 to 688a41f Compare March 12, 2025 18:49
@kira-syslogng
Copy link
Contributor

Build FAILURE

@syslog-ng syslog-ng deleted a comment from github-actions bot Mar 12, 2025
@HofiOne HofiOne force-pushed the add-prometheus-stat-source branch from 688a41f to 2f4b999 Compare March 12, 2025 18:51
@kira-syslogng
Copy link
Contributor

Build FAILURE

@HofiOne HofiOne force-pushed the add-prometheus-stat-source branch from 2f4b999 to bcb69b9 Compare March 12, 2025 18:53
@kira-syslogng
Copy link
Contributor

Build FAILURE

@github-actions
Copy link
Contributor

This Pull Request introduces config grammar changes

syslog-ng/600b1e8e267af83961acd0016c84a4c7654308f9 -> HofiOne/add-prometheus-stat-source

Details
--- a/source
+++ b/source

 network(
+    multi-line-mode(<string>)
     transport(
+        http-scraper
+        scrape-freq-limit(<nonnegative-integer>)
+        scraper(
+            prometheus(
+                <empty>
+                stat-query(<string>)
+                stat-type(<string>)
+            )
+        )
+        single-instance(<yesno>)
     )
 )

 syslog(
+    multi-line-mode(<string>)
 )

 tcp(
+    multi-line-mode(<string>)
 )

 tcp6(
+    multi-line-mode(<string>)
 )

 udp(
+    multi-line-mode(<string>)
 )

 udp6(
+    multi-line-mode(<string>)
 )

@HofiOne HofiOne force-pushed the add-prometheus-stat-source branch from bcb69b9 to e248ae9 Compare March 12, 2025 19:00
@kira-syslogng
Copy link
Contributor

Build FAILURE

@folti
Copy link
Contributor

folti commented Mar 12, 2025

@kira-syslogng test this please;

@kira-syslogng
Copy link
Contributor

Build FAILURE

@HofiOne HofiOne force-pushed the add-prometheus-stat-source branch from e248ae9 to dfc4764 Compare March 12, 2025 21:46
HofiOne added 22 commits March 13, 2025 00:04
…hook into the message parsing flow after a multiline message composed

Signed-off-by: Hofi <[email protected]>
… query executor that is not bound to a ControlConnection

Signed-off-by: Hofi <[email protected]>
…aper responder with syslog-ng stats prometheus outptut response

Signed-off-by: Hofi <[email protected]>
… scarper part from the prometheus handling one

Signed-off-by: Hofi <[email protected]>
… their implementations

"http_scraper"
"scraper"
"scrape_freq_limit"
"single_instance"
"prometheus"
"stat_type"
"stat_query"

Signed-off-by: Hofi <[email protected]>
…eus-stats-dont-log() source

- both are just SCL blocks around the network() source with the new `http-scraper` transport

Signed-off-by: Hofi <[email protected]>
… base LogProtoServerOptionsStorage

Signed-off-by: Hofi <[email protected]>
…ats` to match the one we use in `syslog-ng-ctl`

Signed-off-by: Hofi <[email protected]>
@HofiOne HofiOne force-pushed the add-prometheus-stat-source branch from 1bb463b to c103f37 Compare March 12, 2025 23:08
@kira-syslogng
Copy link
Contributor

Build FAILURE

@HofiOne HofiOne force-pushed the add-prometheus-stat-source branch from c103f37 to f06b413 Compare March 13, 2025 08:31
@kira-syslogng
Copy link
Contributor

Build FAILURE

@HofiOne
Copy link
Collaborator Author

HofiOne commented Mar 13, 2025

closing, as needs more rework

@HofiOne HofiOne closed this Mar 13, 2025
@HofiOne HofiOne deleted the add-prometheus-stat-source branch March 13, 2025 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants