Software /
code /
prosody
Annotate
plugins/mod_lastactivity.lua @ 11523:5f15ab7c6ae5
Statistics: Rewrite statistics backends to use OpenMetrics
The metric subsystem of Prosody has had some shortcomings from
the perspective of the current state-of-the-art in metric
observability.
The OpenMetrics standard [0] is a formalization of the data
model (and serialization format) of the well-known and
widely-used Prometheus [1] software stack.
The previous stats subsystem of Prosody did not map well to that
format (see e.g. [2] and [3]); the key reason is that it was
trying to do too much math on its own ([2]) while lacking
first-class support for "families" of metrics ([3]) and
structured metric metadata (despite the `extra` argument to
metrics, there was no standard way of representing common things
like "tags" or "labels").
Even though OpenMetrics has grown from the Prometheus world of
monitoring, it maps well to other popular monitoring stacks
such as:
- InfluxDB (labels can be mapped to tags and fields as necessary)
- Carbon/Graphite (labels can be attached to the metric name with
dot-separation)
- StatsD (see graphite when assuming that graphite is used as
backend, which is the default)
The util.statsd module has been ported to use the OpenMetrics
model as a proof of concept. An implementation which exposes
the util.statistics backend data as Prometheus metrics is
ready for publishing in prosody-modules (most likely as
mod_openmetrics_prometheus to avoid breaking existing 0.11
deployments).
At the same time, the previous measure()-based API had one major
advantage: It is really simple and easy to use without requiring
lots of knowledge about OpenMetrics or similar concepts. For that
reason as well as compatibility with existing code, it is preserved
and may even be extended in the future.
However, code relying on the `stats-updated` event as well as
`get_stats` from `statsmanager` will break because the data
model has changed completely; in case of `stats-updated`, the
code will simply not run (as the event was renamed in order
to avoid conflicts); the `get_stats` function has been removed
completely (so it will cause a traceback when it is attempted
to be used).
Note that the measure_*_event methods have been removed from
the module API. I was unable to find any uses or documentation
and thus deemed they should not be ported. Re-implementation is
possible when necessary.
[0]: https://openmetrics.io/
[1]: https://prometheus.io/
[2]: #959
[3]: #960
author | Jonas Schäfer <jonas@wielicki.name> |
---|---|
date | Sun, 18 Apr 2021 11:47:41 +0200 |
parent | 10750:ff087f2d4cb6 |
child | 12977:74b9e05af71e |
rev | line source |
---|---|
2018
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
1 -- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2029
diff
changeset
|
2 -- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2029
diff
changeset
|
3 -- Copyright (C) 2008-2010 Waqas Hussain |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
2923
diff
changeset
|
4 -- |
2018
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
5 -- This project is MIT/X11 licensed. Please see the |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
6 -- COPYING file in the source package for more information. |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
7 -- |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
8 |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
9 local st = require "util.stanza"; |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
10 local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed; |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
11 local jid_bare = require "util.jid".bare; |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
12 local jid_split = require "util.jid".split; |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
13 |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
14 module:add_feature("jabber:iq:last"); |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
15 |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
16 local map = {}; |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
17 |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
18 module:hook("pre-presence/bare", function(event) |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
19 local stanza = event.stanza; |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
20 if not(stanza.attr.to) and stanza.attr.type == "unavailable" then |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
21 local t = os.time(); |
6302
76699a0ae4c4
mod_lastactivity, mod_legacyauth, mod_presence, mod_saslauth, mod_tls: Use the newer stanza:get_child APIs and optimize away some table lookups
Kim Alvefur <zash@zash.se>
parents:
5776
diff
changeset
|
22 local s = stanza:get_child_text("status"); |
2018
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
23 map[event.origin.username] = {s = s, t = t}; |
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
24 end |
2029
d2363643a5c0
mod_lastactivity: Gave a positive priority to the presence event hook.
Waqas Hussain <waqas20@gmail.com>
parents:
2026
diff
changeset
|
25 end, 10); |
2018
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
26 |
9224
a84dbd2e08bc
mod_lastactivity: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
6302
diff
changeset
|
27 module:hook("iq-get/bare/jabber:iq:last:query", function(event) |
2018
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
28 local origin, stanza = event.origin, event.stanza; |
9224
a84dbd2e08bc
mod_lastactivity: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
6302
diff
changeset
|
29 local username = jid_split(stanza.attr.to) or origin.username; |
a84dbd2e08bc
mod_lastactivity: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
6302
diff
changeset
|
30 if not stanza.attr.to or is_contact_subscribed(username, module.host, jid_bare(stanza.attr.from)) then |
a84dbd2e08bc
mod_lastactivity: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
6302
diff
changeset
|
31 local seconds, text = "0", ""; |
a84dbd2e08bc
mod_lastactivity: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
6302
diff
changeset
|
32 if map[username] then |
10750
ff087f2d4cb6
mod_lastactivity: Encode seconds as decimal, not float
Kim Alvefur <zash@zash.se>
parents:
9224
diff
changeset
|
33 seconds = string.format("%d", os.difftime(os.time(), map[username].t)); |
9224
a84dbd2e08bc
mod_lastactivity: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
6302
diff
changeset
|
34 text = map[username].s; |
2018
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
35 end |
9224
a84dbd2e08bc
mod_lastactivity: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
6302
diff
changeset
|
36 origin.send(st.reply(stanza):tag('query', {xmlns='jabber:iq:last', seconds=seconds}):text(text)); |
a84dbd2e08bc
mod_lastactivity: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
6302
diff
changeset
|
37 else |
a84dbd2e08bc
mod_lastactivity: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
6302
diff
changeset
|
38 origin.send(st.error_reply(stanza, 'auth', 'forbidden')); |
2018
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
39 end |
9224
a84dbd2e08bc
mod_lastactivity: Simplify iq handling by hooking on iq-get/ instead of iq/.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
6302
diff
changeset
|
40 return true; |
2018
418c04834017
mod_lastactivity: Initial commit.
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
41 end); |
2026
97b17187b29d
mod_lastactivity: Persist data across reloads.
Waqas Hussain <waqas20@gmail.com>
parents:
2025
diff
changeset
|
42 |
97b17187b29d
mod_lastactivity: Persist data across reloads.
Waqas Hussain <waqas20@gmail.com>
parents:
2025
diff
changeset
|
43 module.save = function() |
97b17187b29d
mod_lastactivity: Persist data across reloads.
Waqas Hussain <waqas20@gmail.com>
parents:
2025
diff
changeset
|
44 return {map = map}; |
97b17187b29d
mod_lastactivity: Persist data across reloads.
Waqas Hussain <waqas20@gmail.com>
parents:
2025
diff
changeset
|
45 end |
97b17187b29d
mod_lastactivity: Persist data across reloads.
Waqas Hussain <waqas20@gmail.com>
parents:
2025
diff
changeset
|
46 module.restore = function(data) |
97b17187b29d
mod_lastactivity: Persist data across reloads.
Waqas Hussain <waqas20@gmail.com>
parents:
2025
diff
changeset
|
47 map = data.map or {}; |
97b17187b29d
mod_lastactivity: Persist data across reloads.
Waqas Hussain <waqas20@gmail.com>
parents:
2025
diff
changeset
|
48 end |
97b17187b29d
mod_lastactivity: Persist data across reloads.
Waqas Hussain <waqas20@gmail.com>
parents:
2025
diff
changeset
|
49 |