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.

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

EMQX-9700 improve observability #12299

Merged
merged 38 commits into from Jan 22, 2024

Conversation

JimMoen
Copy link
Member

@JimMoen JimMoen commented Jan 11, 2024

Fixes EMQX-9700

Release version: v/e5.5.0

Summary

PR Checklist

Please convert it to a draft if any of the following conditions are not met. Reviewers may skip over until all the items are checked:

  • Added tests for the changes
  • Added property-based tests for code which performs user input validation
  • Changed lines covered in coverage report
  • Change log has been added to changes/(ce|ee)/(feat|perf|fix|breaking)-<PR-id>.en.md files
  • For internal contributor: there is a jira ticket to track this change
  • Created PR to emqx-docs if documentation update is required, or link to a follow-up jira ticket
  • Schema changes are backward compatible

Checklist for CI (.github/workflows) changes

  • If changed package build workflow, pass this action (manual trigger)
  • Change log has been added to changes/ dir for user-facing artifacts update

@JimMoen JimMoen changed the title Emqx 9700 improve observability EMQX-9700 improve observability Jan 11, 2024
@JimMoen JimMoen force-pushed the EMQX-9700-improve-observability branch 2 times, most recently from 57c645e to 5db76c6 Compare January 11, 2024 20:00
apps/emqx_prometheus/src/emqx_prometheus_app.erl Outdated Show resolved Hide resolved
apps/emqx_prometheus/src/emqx_prometheus.erl Outdated Show resolved Hide resolved
apps/emqx_prometheus/src/emqx_prometheus.erl Outdated Show resolved Hide resolved
@JimMoen JimMoen force-pushed the EMQX-9700-improve-observability branch from 5db76c6 to 4dc4ec4 Compare January 11, 2024 20:38
NCluster#{license_quota => V};
%% for cluster sample, ignore node_uptime
(node_uptime, _V, NCluster) ->
NCluster;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe include this uptime in the Prometheus metrics as well. It would be very useful!

@JimMoen JimMoen force-pushed the EMQX-9700-improve-observability branch from 4dc4ec4 to e4b798f Compare January 14, 2024 02:54
@JimMoen JimMoen changed the base branch from master to release-55 January 14, 2024 02:55
@JimMoen JimMoen force-pushed the EMQX-9700-improve-observability branch from e4b798f to 9e01d10 Compare January 14, 2024 19:12
@JimMoen JimMoen force-pushed the EMQX-9700-improve-observability branch 2 times, most recently from 776bd75 to 62a7346 Compare January 15, 2024 06:52
@JimMoen JimMoen marked this pull request as ready for review January 15, 2024 06:53
@JimMoen JimMoen requested review from lafirest and a team as code owners January 15, 2024 06:53
@JimMoen JimMoen force-pushed the EMQX-9700-improve-observability branch 5 times, most recently from 4e26020 to 5493080 Compare January 18, 2024 06:08
apps/emqx_prometheus/src/emqx_prometheus_auth.erl Outdated Show resolved Hide resolved
apps/emqx_prometheus/src/emqx_prometheus_auth.erl Outdated Show resolved Hide resolved
apps/emqx_prometheus/src/emqx_prometheus_auth.erl Outdated Show resolved Hide resolved
apps/emqx_prometheus/src/emqx_prometheus_auth.erl Outdated Show resolved Hide resolved
apps/emqx_prometheus/src/emqx_prometheus_auth.erl Outdated Show resolved Hide resolved
@JimMoen JimMoen force-pushed the EMQX-9700-improve-observability branch from 75917b1 to 5b6c948 Compare January 19, 2024 08:19
- `retained_msg_count`
  Current retained_msg_count on each node and should be same on all nodes.

- `license_quota`
  Only for enterprise edition, provides the max limited connections num.
- rm rate fields
- fix few fields type to counter
- node(default):
  The only supported format_mode for PushGateway.
  Return the current node's metrics.
  -  Without label `node_name` with content-type: `text/plain`.
  -  Without key `node_name` with content-type: `application/json`

- nodes_aggregated:
  Return all nodes metrics Arithmetic-Sum or Logical-Sum.
  See details in callback modules.
    - Logical-Sum for metrics named with `xxx_enable` or `xxx_status`.
    - Arithmetic-Sum for other metrics.
  `node_name` field:
    -  Without label `node_name` with content-type: `text/plain`.
    -  Without key `node_name` with content-type: `application/json`

- nodes_unaggregated:
  Return all nodes metrics without aggregated.
  `node_name` field:
    -  _With_ label `node_name` with content-type: `text/plain`.
    -  _With_ key `node_name` with content-type: `application/json`
@JimMoen JimMoen force-pushed the EMQX-9700-improve-observability branch 2 times, most recently from 33d4621 to d423762 Compare January 21, 2024 14:36
HJianBo
HJianBo previously approved these changes Jan 22, 2024
@JimMoen JimMoen merged commit 59c5e3c into emqx:release-55 Jan 22, 2024
165 checks passed
@JimMoen JimMoen deleted the EMQX-9700-improve-observability branch January 22, 2024 04:46
@JimMoen JimMoen mentioned this pull request Jan 25, 2024
9 tasks
HJianBo added a commit that referenced this pull request Jan 25, 2024
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.

None yet

3 participants