Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

stats: Do not expand dots of tm_name #10316

Closed
wants to merge 3 commits into from
Closed

stats: Do not expand dots of tm_name #10316

wants to merge 3 commits into from

Commits on Feb 5, 2024

  1. stats: Do not expand dots of tm_name 

    When an interface with dots is used, per worker stats are nested by the
dot-separated-components of the interface due to the usage of
OutputStats2Json().

Prevent this by using OutputStats2Json() on a per-thread specific object
and setting this object into the threads object using the
json_object_set_new() which won't do the dot expansion.

This was tested by creating an interface with dots in the name
and checking the stats.

    ip link add name a.b.c type dummy

With Suricata 7.0.2, sniffing on the a.b.c interface results in the
following worker stats format:

    "threads": {
      "W#01-a": {
        "b": {
          "c": {
            "capture": {
              "kernel_packets": 0,

After this fix, the output looks as follows:

    "threads": {
      "W#01-a.b.c": {
        "capture": {
          "kernel_packets": 0,

Ticket: OISF#6732
    @awelzel
    awelzel committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    b2b6b60 View commit details
    Browse the repository at this point in the history

  2. fixup! stats: Do not expand dots of tm_name

    @awelzel
    awelzel committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    8922e2d View commit details
    Browse the repository at this point in the history

  3. fixup! stats: Do not expand dots of tm_name 

    Use DEBUG_VALIDATE_BUG_ON instead of plain assert()
    @awelzel
    awelzel committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    0d2e687 View commit details
    Browse the repository at this point in the history