Merge pull request #6732 from JimMoen/telemetry-api-refactor

refactor(api): telemetry api swagger spec
2022-01-14 09:36:54 +08:00 · 2022-01-14 09:36:54 +08:00 · d8f49f8a5f
parent e6d1c545ec 2939803215
commit d8f49f8a5f
23 changed files with 186 additions and 58 deletions
--- a/.ci/fvt_tests/http_server/rebar.config
+++ b/.ci/fvt_tests/http_server/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {erl_opts, [debug_info]}.
 {deps,
 [
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {erl_opts, [warn_unused_vars,warn_shadow_vars,warn_unused_import,
            warn_obsolete_guard,compressed]}.

--- a/apps/emqx/rebar.config.script
+++ b/apps/emqx/rebar.config.script
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 IsCentos6 = fun() ->
                case file:read_file("/etc/centos-release") of
                    {ok, <<"CentOS release 6", _/binary >>} ->
--- a/apps/emqx_authn/rebar.config
+++ b/apps/emqx_authn/rebar.config
@ -1,4 +1,7 @@
-{deps, [ {emqx, {path, "../emqx"}}
+%% -*- mode: erlang -*-
+
+{deps,
+ [ {emqx, {path, "../emqx"}}
 , {emqx_connector, {path, "../emqx_connector"}}
 ]}.

--- a/apps/emqx_authz/rebar.config
+++ b/apps/emqx_authz/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {erl_opts, [debug_info, nowarn_unused_import]}.
 {deps, [ {emqx, {path, "../emqx"}}
       , {emqx_connector, {path, "../emqx_connector"}}
--- a/apps/emqx_auto_subscribe/rebar.config
+++ b/apps/emqx_auto_subscribe/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {erl_opts, [debug_info]}.
 {deps, [ {emqx, {path, "../emqx"}}
       ]}.
--- a/apps/emqx_conf/rebar.config
+++ b/apps/emqx_conf/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {erl_opts, [debug_info]}.
 {deps, [ {emqx, {path, "../emqx"}}
       ]}.
--- a/apps/emqx_connector/rebar.config
+++ b/apps/emqx_connector/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {erl_opts, [
  nowarn_unused_import,
  debug_info
--- a/apps/emqx_dashboard/rebar.config
+++ b/apps/emqx_dashboard/rebar.config
@ -1,4 +1,7 @@
-{deps, [ {typerefl, {git, "https://github.com/k32/typerefl", {tag, "0.8.6"}}}
+%% -*- mode: erlang -*-
+
+{deps,
+ [ {typerefl, {git, "https://github.com/k32/typerefl", {tag, "0.8.6"}}}
 , {emqx, {path, "../emqx"}}
 ]}.

--- a/apps/emqx_gateway/rebar.config
+++ b/apps/emqx_gateway/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {erl_opts, [debug_info]}.
 {deps, [
  {emqx, {path, "../emqx"}},
--- a/apps/emqx_machine/rebar.config
+++ b/apps/emqx_machine/rebar.config
@ -1,2 +1,4 @@
+%% -*- mode: erlang -*-
+
 {deps, [ {emqx, {path, "../emqx"}}
       ]}.
--- a/apps/emqx_management/rebar.config
+++ b/apps/emqx_management/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {deps, [ {emqx, {path, "../emqx"}}
       ]}.

--- a/apps/emqx_modules/rebar.config
+++ b/apps/emqx_modules/rebar.config
@ -1,2 +1,5 @@
-{deps, [ {emqx, {path, "../emqx"}}
+%% -*- mode: erlang -*-
+
+{deps,
+ [ {emqx, {path, "../emqx"}}
 ]}.
--- a/apps/emqx_modules/src/emqx_telemetry_api.erl
+++ b/apps/emqx_modules/src/emqx_telemetry_api.erl
@ -18,12 +18,9 @@

 -behaviour(minirest_api).

-import(emqx_mgmt_util, [ schema/1
-                        , object_schema/1
-                        , object_schema/2
-                        , properties/1
-                        , bad_request/0
-                        ]).
+-include_lib("typerefl/include/types.hrl").
+
+-import(hoconsc, [mk/2, ref/1, ref/2, array/1]).

 % -export([cli/1]).

@ -33,54 +30,139 @@

 -export([enable_telemetry/2]).

-export([api_spec/0]).
-
-api_spec() ->
-    {[status_api(), data_api()], []}.
-
-properties() ->
-    properties([
-        {emqx_version, string, <<"EMQ X Version">>},
-        {license, object, [{edition, string, <<"EMQ X License">>}]},
-        {os_name, string, <<"OS Name">>},
-        {os_version, string, <<"OS Version">>},
-        {otp_version, string, <<"Erlang/OTP Version">>},
-        {up_time, string, <<"EMQ X Runtime">>},
-        {uuid, string, <<"EMQ X UUID">>},
-        {nodes_uuid, string, <<"EMQ X Cluster Nodes UUID">>},
-        {active_plugins, {array, string}, <<"EMQ X Active Plugins">>},
-        {active_modules, {array, string}, <<"EMQ X Active Modules">>},
-        {num_clients, integer, <<"EMQ X Current Connections">>},
-        {messages_received, integer, <<"EMQ X Current Received Message">>},
-        {messages_sent, integer, <<"EMQ X Current Sent Message">>}
+-export([ api_spec/0
+        , paths/0
+        , schema/1
+        , fields/1
        ]).

-status_api() ->
-    Props = properties([{enable, boolean}]),
-    Metadata = #{
-        get => #{
-            description => "Get telemetry status",
-            responses => #{<<"200">> => object_schema(Props)}
-        },
-        put => #{
-            description => "Enable or disable telemetry",
-            'requestBody' => object_schema(Props),
-            responses => #{
-                <<"200">> =>
-                    object_schema(properties([{enable, boolean, <<"">>}]),
-                        <<"Enable or disable telemetry successfully">>),
-                <<"400">> => bad_request()
-            }
-        }
-    },
-    {"/telemetry/status", Metadata, status}.
+-define(BAD_REQUEST, 'BAD_REQUEST').

-data_api() ->
-    Metadata = #{
-        get => #{
-            responses => #{
-                <<"200">> => object_schema(properties(), <<"Get telemetry data">>)}}},
-    {"/telemetry/data", Metadata, data}.
+api_spec() ->
+    emqx_dashboard_swagger:spec(?MODULE, #{check_schema => true}).
+
+paths() ->
+    [ "/telemetry/status"
+    , "/telemetry/data"
+    ].
+
+schema("/telemetry/status") ->
+    #{ 'operationId' => status,
+       get =>
+           #{ description => <<"Get telemetry status">>
+            , responses =>
+                  #{ 200 => status_schema(<<"Get telemetry status">>)}
+            },
+       put =>
+           #{ description => <<"Enable or disable telemetry">>
+            , 'requestBody' => status_schema(<<"Enable or disable telemetry">>)
+            , responses =>
+                  #{ 200 => status_schema(<<"Enable or disable telemetry successfully">>)
+                   , 400 => emqx_dashboard_swagger:error_codes([?BAD_REQUEST], <<"Bad Request">>)
+                   }
+            }
+     };
+schema("/telemetry/data") ->
+    #{ 'operationId' => data,
+       get =>
+           #{ description => <<"Get telemetry data">>
+            , responses =>
+                  #{ 200 => mk(ref(?MODULE, telemetry), #{ desc => <<"Get telemetry data">>})}}
+     }.
+
+status_schema(Desc) ->
+    mk(ref(?MODULE, status), #{desc => Desc}).
+
+fields(status) ->
+    [ { enable
+      , mk( boolean()
+          , #{ desc => <<"Telemetry status">>
+             , default => false
+             , example => false
+             })
+      }
+    ];
+fields(telemetry) ->
+    [ { emqx_version
+      , mk( string()
+          , #{ desc => <<"EMQ X Version">>
+             , example => <<"5.0.0-beta.3-32d1547c">>
+             })
+      }
+    , { license
+      , mk( map()
+          , #{ desc => <<"EMQ X License">>
+             , example => #{edition => <<"community">>}
+             })
+      }
+    , { os_name
+      , mk( string()
+          , #{ desc => <<"OS Name">>
+             , example => <<"Linux">>
+             })
+      }
+    , { os_version
+      , mk( string()
+          , #{ desc => <<"OS Version">>
+             , example => <<"20.04">>
+             })
+      }
+    , { otp_version
+      , mk( string()
+          , #{ desc => <<"Erlang/OTP Version">>
+             , example => <<"24">>
+             })
+      }
+    , { up_time
+      , mk( integer()
+          , #{ desc => <<"EMQ X Runtime">>
+             , example => 20220113
+             })
+      }
+    , { uuid
+      , mk( string()
+          , #{ desc => <<"EMQ X UUID">>
+             , example => <<"AAAAAAAA-BBBB-CCCC-2022-DDDDEEEEFFF">>
+             })
+      }
+    , { nodes_uuid
+      , mk( array(binary())
+          , #{ desc => <<"EMQ X Cluster Nodes UUID">>
+             , example => [ <<"AAAAAAAA-BBBB-CCCC-2022-DDDDEEEEFFF">>
+                          , <<"ZZZZZZZZ-CCCC-BBBB-2022-DDDDEEEEFFF">>]
+             })
+      }
+    , { active_plugins
+      , mk( array(binary())
+          , #{ desc => <<"EMQ X Active Plugins">>
+             , example => [<<"Plugin A">>, <<"Plugin B">>]
+             })
+      }
+    , { active_modules
+      , mk( array(binary())
+          , #{ desc => <<"EMQ X Active Modules">>
+             , example => [<<"Module A">>, <<"Module B">>]
+             })
+      }
+    , { num_clients
+      , mk( integer()
+          , #{ desc => <<"EMQ X Current Connections">>
+             , example => 20220113
+             })
+      }
+    , { messages_received
+      , mk( integer()
+          , #{ desc => <<"EMQ X Current Received Message">>
+             , example => 2022
+             })
+      }
+    , { messages_sent
+      , mk( integer()
+          , #{ desc => <<"EMQ X Current Sent Message">>
+             , example => 2022
+             })
+      }
+    ].

 %%--------------------------------------------------------------------
 %% HTTP API
--- a/apps/emqx_plugin_libs/rebar.config
+++ b/apps/emqx_plugin_libs/rebar.config
@ -1,2 +1,4 @@
+%% -*- mode: erlang -*-
+
 {deps, [ {emqx, {path, "../emqx"}}
       ]}.
--- a/apps/emqx_plugins/rebar.config
+++ b/apps/emqx_plugins/rebar.config
@ -1,2 +1,4 @@
+%% -*- mode: erlang -*-
+
 {deps, [ {emqx, {path, "../emqx"}}
       ]}.
--- a/apps/emqx_prometheus/rebar.config
+++ b/apps/emqx_prometheus/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {deps,
 [ {emqx, {path, "../emqx"}},
   %% FIXME: tag this as v3.1.3
--- a/apps/emqx_psk/rebar.config
+++ b/apps/emqx_psk/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {deps, [ {emqx, {path, "../emqx"}}
       ]}.

--- a/apps/emqx_resource/rebar.config
+++ b/apps/emqx_resource/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {erl_opts, [ debug_info
           , nowarn_unused_import
           %, {d, 'RESOURCE_DEBUG'}
@ -14,4 +16,3 @@

 {deps, [ {jsx, {git, "https://github.com/talentdeficit/jsx", {tag, "v3.1.0"}}}
       ]}.
-
--- a/apps/emqx_retainer/rebar.config
+++ b/apps/emqx_retainer/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {deps, [ {emqx, {path, "../emqx"}}
       ]}.

--- a/apps/emqx_rule_engine/rebar.config
+++ b/apps/emqx_rule_engine/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {deps, [ {emqx, {path, "../emqx"}}
       ]}.

--- a/apps/emqx_slow_subs/rebar.config
+++ b/apps/emqx_slow_subs/rebar.config
@ -1,2 +1,4 @@
+%% -*- mode: erlang -*-
+
 {deps, [ {emqx, {path, "../emqx"}}
       ]}.
--- a/apps/emqx_statsd/rebar.config
+++ b/apps/emqx_statsd/rebar.config
@ -1,3 +1,5 @@
+%% -*- mode: erlang -*-
+
 {erl_opts, [debug_info]}.
 {deps, [ {emqx, {path, "../emqx"}}
       , {estatsd, {git, "https://github.com/emqx/estatsd", {tag, "0.1.0"}}}