wip

Author: SimonUnge

deps/rabbit/priv/schema/rabbit.schema

@@ -2688,6 +2688,20 @@ fun(Conf) ->
     end
 end}.
 
+{mapping, "cluster_tags.$tag", "rabbit.cluster_tags", [
+    {datatype, [string]}
+]}.
+
+{translation, "rabbit.cluster_tags",
+fun(Conf) ->
+    case cuttlefish:conf_get("cluster_tags", Conf, undefined) of
+        none -> [];
+        _ ->
+            Settings = cuttlefish_variable:filter_by_prefix("cluster_tags", Conf),
+            [ {K, V} || {[_, K], V} <- Settings]
+    end
+end}.
+
 % ===============================
 % Validators
 % ===============================

deps/rabbitmq_management/src/rabbit_mgmt_wm_overview.erl

@@ -47,6 +47,7 @@ to_json(ReqData, Context = #context{user = User = #user{tags = Tags}}) ->
                  {product_name,              list_to_binary(rabbit:product_name())},
                  {rabbitmq_version,          list_to_binary(rabbit:base_product_version())},
                  {cluster_name,              rabbit_nodes:cluster_name()},
+                 {cluster_tags,              cluster_tags()},
                  {erlang_version,            erlang_version()},
                  {erlang_full_version,       erlang_full_version()},
                  {release_series_support_status, rabbit_release_series:readable_support_status()},
@@ -182,3 +183,14 @@ transform_retention_intervals([{MaxAgeInSeconds, _}|Rest], Acc) ->
                      0
              end,
     transform_retention_intervals(Rest, [AccVal|Acc]).
+
+cluster_tags() ->
+    case application:get_env(rabbit, cluster_tags) of
+        undefined ->
+            [];
+       {ok, Tags} ->
+            lists:map(fun({K, V}) ->
+                              {list_to_binary(K), list_to_binary(V)}
+                      end,
+                      Tags)
+    end.

deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl

@@ -334,6 +334,7 @@ totals(Callback) ->
 emit_identity_info(Callback) ->
     add_metric_family(build_info(), Callback),
     add_metric_family(identity_info(), Callback),
+    lists:foreach(fun(Tag) -> add_metric_family(Tag, Callback) end, tag_info()),
     ok.
 
 %% Aggregated `auth``_attempt_detailed_metrics` and
@@ -397,6 +398,31 @@ identity_info() ->
         }]
     }.
 
+tag_info() ->
+    [{
+        tag_info,
+        untyped,
+        "RabbitMQ node tag info",
+        [{
+            [
+                {rabbitmq_tags, <<"tag1">>}
+            ],
+            1
+        }]
+    },
+     {
+      tag_info,
+      untyped,
+      "RabbitMQ node tag info",
+      [{
+        [
+         {rabbitmq_tags, <<"tag2">>}
+        ],
+        1
+       }]
+     }
+    ].
+
 add_metric_family({Name, Type, Help, Metrics}, Callback) ->
     MN = <<?METRIC_NAME_PREFIX/binary, (prometheus_model_helpers:metric_name(Name))/binary>>,
     Callback(create_mf(MN, Help, Type, Metrics)).
@@ -854,4 +880,3 @@ vhosts_filter_from_pdict() ->
             Enabled = maps:from_list([ {VHost, true} || VHost <- L ]),
             maps:merge(All, Enabled)
     end.
-