Skip to content

Commit

Permalink
[filebeat][httpjson] - Fix input metric name (#36169) (#36172)
Browse files Browse the repository at this point in the history
* fixed httpjson input metric naming convention to solve parsing error in fleet

* fixed httpjson input metric naming convention to solve parsing error in fleet

* updated asciidoc with issue and pr description

* Update CHANGELOG-developer.next.asciidoc

Co-authored-by: Andrew Kroh <[email protected]>

---------

Co-authored-by: Andrew Kroh <[email protected]>
(cherry picked from commit 3c807b0)

Co-authored-by: ShourieG <[email protected]>
  • Loading branch information
mergify[bot] and ShourieG authored Jul 29, 2023
1 parent 64bdee7 commit 0ddfb1e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-developer.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ The list below covers the major changes between 7.0.0-rc2 and main only.
- Fix the multiple host support for mongodb module {pull}34624[34624]
- Skip HTTPJSON flakey test. {issue}34929[34929] {pull}35138[35138]
- Fix ingest pipeline for panw module to parse url scheme correctly {pull}35757[35757]
- Renamed an httpjson input metric to follow naming conventions. `httpjson_interval_pages_total` was renamed to `httpjson_interval_pages` because the `_total` suffix is reserved for counters. {issue}35933[35933] {pull}36169[36169]

==== Added

Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/docs/inputs/input-httpjson.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -1560,7 +1560,7 @@ observe the activity of the input.
| `httpjson_interval_total` | Total number of intervals executed.
| `httpjson_interval_errors_total` | Total number of interval errors.
| `httpjson_interval_execution_time` | Histogram of the interval execution time.
| `httpjson_interval_pages_total` | Histogram of the total number of pages per interval.
| `httpjson_interval_pages` | Histogram of the total number of pages per interval.
| `httpjson_interval_pages_execution_time` | Histogram of the interval pages execution time.
|=======

Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/input/httpjson/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func newInputMetrics(reg *monitoring.Registry) *inputMetrics {
GetOrRegister("histogram", metrics.NewHistogram(out.intervalExecutionTime))
_ = adapter.GetGoMetrics(reg, "httpjson_interval_pages_execution_time", adapter.Accept).
GetOrRegister("histogram", metrics.NewHistogram(out.intervalPageExecutionTime))
_ = adapter.GetGoMetrics(reg, "httpjson_interval_pages_total", adapter.Accept).
_ = adapter.GetGoMetrics(reg, "httpjson_interval_pages", adapter.Accept).
GetOrRegister("histogram", metrics.NewHistogram(out.intervalPages))

return out
Expand Down

0 comments on commit 0ddfb1e

Please sign in to comment.