Commit graph

16612 commits

Author SHA1 Message Date
Tim Wojtulewicz
00b24b043a Set running_under_test for scripts.base.frameworks.logging.telemetry test 2024-06-04 14:14:57 -07:00
Tim Wojtulewicz
07d845b558 Merge remote-tracking branch 'origin/topic/awelzel/stevesmoot-reporter-error-updates'
* origin/topic/awelzel/stevesmoot-reporter-error-updates:
  Update reporter.bif to describe special case of errors in init
2024-06-04 11:36:23 -07:00
Tim Wojtulewicz
e7b0a0a887 Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Jun24'
* origin/topic/vern/script-opt-maint.Jun24:
  script optimization baseline tweaks due to recent minor changes
  updated list of BiFs for script optimization
  addressed some Coverity nits
  improved error cascade for invalid attributes
2024-06-04 10:36:57 -07:00
Vern Paxson
0ee28866a1 script optimization baseline tweaks due to recent minor changes 2024-06-04 10:36:36 -07:00
Vern Paxson
50b1f6e013 updated list of BiFs for script optimization 2024-06-04 10:36:36 -07:00
Vern Paxson
aab5324e20 addressed some Coverity nits 2024-06-04 10:36:36 -07:00
Vern Paxson
b0d9a841f5 improved error cascade for invalid attributes 2024-06-04 10:36:36 -07:00
Benjamin Bannier
76c92d6b14 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy' 2024-06-04 12:26:16 +02:00
Smoot
f20d505007 Update reporter.bif to describe special case of errors in init
Originally proposed in zeek/zeek-docs#257, but reverted via
9f9ebde62380a3012a1471d9ff1c1c91c7aa69da.
2024-06-04 11:56:06 +02:00
Benjamin Bannier
8339b40c41 Bump Spicy to latest dev snapshot 2024-06-04 10:27:51 +02:00
Tim Wojtulewicz
29d66ec197 Merge branch 'topic/timw/prometheus-cpp-3'
* topic/timw/prometheus-cpp-3: (35 commits)
  Update docs submodule [nomail] [skip ci]
  Add type aliases for instrument and family shared_ptrs
  Update NEWS for double and is_sum changes
  Remove is_sum arguments from counters and gauges
  Change all instruments to only handle doubles
  Add comment to telemetry::Manager::InitPostScript
  Remove all of the ZEEK_METRICS_ environment variables
  Fix header comments in scripts/policy/frameworks/telemetry/prometheus.zeek
  Change all prometheus #includes to use angle brackets
  Update zeekctl submodule for metrics_port node.cfg option
  Regenerate docs [nomail]
  Remove the is_sum argument from BIF histogram creation methods
  Update NEWS for Telemetry rework
  Remove Telemetry::metrics_export_prefixes option
  Validate that label names are constant in non-zeek metrics
  Avoid calling Collect() in counter/gauge Value() methods if not needed
  Fix some determinism issues with btests
  Temporarily disable the scripts/base/frameworks/telemetry/internal-metrics btest
  Fix the scripts.policy.frameworks.telemetry.prometheus btest to use the service discovery endpoint
  Btest updates due to recent changes
  ...
2024-05-31 14:18:48 -07:00
Tim Wojtulewicz
45de68580a Update docs submodule [nomail] [skip ci] 2024-05-31 13:51:32 -07:00
Tim Wojtulewicz
52e6314f0e Add type aliases for instrument and family shared_ptrs 2024-05-31 13:36:37 -07:00
Tim Wojtulewicz
bbc14cfff0 Update NEWS for double and is_sum changes 2024-05-31 13:36:37 -07:00
Tim Wojtulewicz
93717ca8f8 Remove is_sum arguments from counters and gauges 2024-05-31 13:36:37 -07:00
Tim Wojtulewicz
46ff48c29a Change all instruments to only handle doubles 2024-05-31 13:36:37 -07:00
Tim Wojtulewicz
6eab954fd2 Add comment to telemetry::Manager::InitPostScript 2024-05-31 13:36:37 -07:00
Tim Wojtulewicz
e3e806ca23 Remove all of the ZEEK_METRICS_ environment variables 2024-05-31 13:36:37 -07:00
Tim Wojtulewicz
635198793d Fix header comments in scripts/policy/frameworks/telemetry/prometheus.zeek 2024-05-31 13:36:37 -07:00
Tim Wojtulewicz
178103d2ee Change all prometheus #includes to use angle brackets 2024-05-31 13:36:37 -07:00
Tim Wojtulewicz
a49e1772cf Update zeekctl submodule for metrics_port node.cfg option 2024-05-31 13:36:37 -07:00
Tim Wojtulewicz
9fb952a5f3 Regenerate docs [nomail] 2024-05-31 13:30:32 -07:00
Tim Wojtulewicz
53c3d2032a Remove the is_sum argument from BIF histogram creation methods 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
0ee3b8c506 Update NEWS for Telemetry rework 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
4361880e09 Remove Telemetry::metrics_export_prefixes option 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
c4875da74e Validate that label names are constant in non-zeek metrics 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
d0d41f5c56 Avoid calling Collect() in counter/gauge Value() methods if not needed 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
e195d3d778 Fix some determinism issues with btests 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
d6e97ab306 Temporarily disable the scripts/base/frameworks/telemetry/internal-metrics btest 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
074a87b609 Fix the scripts.policy.frameworks.telemetry.prometheus btest to use the service discovery endpoint 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
a63ea5a04e Btest updates due to recent changes 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
017ee4509c Update telemetry log policy due to the fact that unit will not be filled in anymore 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
84aa308527 Rework everything to access the prometheus-cpp objects more directly 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
ec3e68928f Move telemetry opaques out of OpaqueVal.h 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
2267de21e6 Add GetRegistry() method for retrieving access to prometheus-cpp registry 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
128bf3fe9f Remove Broker metrics configuration values and methods 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
1cad305e58 Add support for callbacks for gauges/counters, restore process stat metrics 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
e93e4cc26d Add a services.json endpoint for Prometheus service discovery 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
abb84db6c8 Don't include endpoint label/value when collecting metrics internally 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
4718e5cf00 Remove everything related to aggregation 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
643bb38419 Make all options const-redefs, remove all of the change handler code 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
17d09c657b Move base types from telemetry framework to init-bare 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
d7b9924058 Update test baselines due to underscore changes 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
a0ae06b3cd Convert telemetry code to use prometheus-cpp 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
97a35011a7 Add necessary script-land changes 2024-05-31 13:30:31 -07:00
Tim Wojtulewicz
54500228c6 Add prometheus-cpp submodule, FindPrometheusCpp cmake module 2024-05-31 13:30:31 -07:00
Christian Kreibich
1d4a169dd4 Merge branch 'topic/christian/analyzer-lookup-bifs'
* topic/christian/analyzer-lookup-bifs:
  More precise error reporting for the disable_analyzer() BiF
  Add btests for the lookup_connection_analyzer_id() BiF.
  Add BiF for looking up a connection's numeric protocol analyzer IDs
2024-05-31 09:37:52 -07:00
Christian Kreibich
a599fe0438 More precise error reporting for the disable_analyzer() BiF
This replaces generic reporter->Error() calls with the builtin-specific variety,
which gives better context in the resulting error messages (such as the script
and line causing it).

Includes corresponding baseline update in one affected btest.
2024-05-30 16:38:22 -07:00
Christian Kreibich
09b70879b0 Add btests for the lookup_connection_analyzer_id() BiF. 2024-05-30 16:38:09 -07:00
Christian Kreibich
3e97ec39b8 Add BiF for looking up a connection's numeric protocol analyzer IDs
This adds a new lookup_connection_analyzer_id() BiF to find a given connection's
numeric identifier for a given protocol analyzer (as defined by the underlying
Analyzer::id_counter).

This enables users to call disable_analyzer(), which requires a numeric analyzer
ID, outside of analyzer_confirmation_info and analyzer_violation_info events
handlers.
2024-05-30 16:36:51 -07:00