cosmos 5.0.2.pre.beta2 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d4390bab17eaae8211e4f962d86736d5c3a421a019c5111f977fc223c7389ef
-  data.tar.gz: bdda929cc3e78a3ba006dec4cc125cd90a666adb986ac64581d4106cb73f470a
+  metadata.gz: 5a561fd5492c1b282759d45170da4e687b4e53eea086804bde1c549a75a8bdd5
+  data.tar.gz: c88407b16125e7ef2fb9764dd14338f6508e2fbde1567ff3b7d23b24f1b7dd2a
 SHA512:
-  metadata.gz: '009d045601a68a022b85e0e6c691640c3c796f3276608b0cd749f4ff5cedda2629990b36a2e5aefb6360f05a6874b0587a90579dcf6c5d4919e0b8d913de40d8'
-  data.tar.gz: e68942874d1957d51f6ab7f355c24220edbdf082aa8b3b441d20997e6fb7f870c5837026cb1a75c8e2a43ff5e7044094c78887c5e24632e053cdeadfb2d51a44
+  metadata.gz: f80a81b27f8c00611a730ef329b4c4afc01e572419ee03d1c7621295e2670a1e829d41511ee4a82af5874d43d32f7b51280281c26310ee8f1e79e767e987c542
+  data.tar.gz: 14f36f225ac641ca74dac4eca580ffad8e6ffea7d69bed1c685d387db0ff6d3977c6ad8b148b8a8117914bd7752914423d2691aa899b0ec902fde5c25f4e931a

data/bin/cosmos

@@ -99,7 +99,7 @@ def generate(args)
       end
       base_name.sub!("target.rb", target_lib_filename)
       base_name.sub!("plugin.gemspec", "#{plugin_name}.gemspec")
-      output = ERB.new(File.read(file)).result(b)
+      output = ERB.new(File.read(file), trim_mode: "-").result(b)
       File.open(base_name, 'w') do |file|
         file.write output
       end

data/data/config/microservice.yaml

@@ -2,65 +2,77 @@
 MICROSERVICE:
   summary: Defines a new microservice
   example: MICROSERVICE EXAMPLE example-microservice
+  description: Defines a microservice that the plugin adds to the COSMOS system. Microservices are background software processes that perform persistent processing.
   parameters:
-    - name: Folder Name
+    - name: Microservice Folder Name
+      description: The exact name of the microservice folder in the plugin. ie. microservices/<Microservice Folder Name>
       required: true
-      description: The target folder where the microservice is located
-      values: .*
-    - name: Name
+      values: .+
+    - name: Microservice Name
+      description: The specific name of this instance of the microservice in the COSMOS system
       required: true
-      description: The microservice name
-      values: .*
+      values: .+
   modifiers:
     ENV:
-      summary: Environment variable
+      summary: Sets an environment variable in the microservice.
       parameters:
-        - name: Name
+        - name: Key
           required: true
           description: Environment variable name
-          values: .*
+          values: .+
         - name: Value
           required: true
           description: Environment variable value
-          values: .*
+          values: .+
     WORK_DIR:
-      summary: Directory to start the microservice in (CWD)
+      summary: Set the working directory
+      description: Working directory to run the microservice CMD in.  Can be a path relative to the microservice folder in the plugin, or an absolute path in the container the microservice runs in.
       parameters:
-        - name: Path
+        - name: Directory
           required: true
-          description: Relative path from the target directory
-          values: .*
+          description: Working directory to run the microservice CMD in. Can be a path relative to the microservice folder in the plugin, or an absolute path in the container the microservice runs in.
+          values: .+
     TOPIC:
-      summary: Topic the microservice should process data from
+      summary: Associate a Redis topic
+      description: Redis topic to associate with this microservice. Standard COSMOS microservices such as decom_microservice use this information to know what packet streams to subscribe to. The TOPIC keyword can be used as many times as necessary to associate all needed topics.
       parameters:
-        - name: Name
+        - name: Topic Name
           required: true
-          description: Topic name
-          values: .*
+          description: Redis Topic to associate with the microservice
+          values: .+
     TARGET_NAME:
-      summary: Target which this microservice processes
+      summary: Associate a COSMOS target
+      description: COSMOS target to associate with the microservice. For standard COSMOS microservices such as decom_microservice this causes the target configuration to get loaded into the container for the microservice.
       parameters:
-        - name: Name
+        - name: Target Name
           required: true
-          description: Target name
-          values: .*
+          description: COSMOS target to associate with the microservice
+          values: .+
     CMD:
-      summary: Command to run which starts the microservice
+      summary: Command line to execute to run the microservice.
+      description: Command line to execute to run the microservice.
       parameters:
-        - name: Executable
+        - name: Args
           required: true
-          description: Executable to call
-          values: .*
-        - name: Command parameters
-          required: false
-          description: Additional parameters used by the command
+          description: One or more arguments to exec to run the microservice.
+          values: .+
     OPTION:
-      summary: Options to pass to the underlying microservice (used by InterfaceMicroservice, etc.)
+      summary: Pass an option to the microservice
+      description: Generic key/value(s) options to pass to the microservice. These take the form of KEYWORD/PARAMS like a line in a COSMOS configuration file. Multiple OPTION keywords can be used to pass multiple options to the microservice.
       parameters:
-        - name: Name
+        - name: Option Name
+          required: true
+          description: Name of the option
+          values: .+
+        - name: Option Value(s)
           required: true
-          description: Option name
-          values: .*
-        - name: Values
+          description: One or more values to associate with the option
+          values: .+
+    CONTAINER:
+      summary: Docker Container.
+      description: Container to execute and run the microservice in.
+      parameters:
+        - name: Args
           required: false
-          description: Option values
+          description: Name of the container
+          values: .+

data/data/config/plugins.yaml

@@ -65,153 +65,6 @@ ROUTER:
         <%= MetaConfigParser.load('_interfaces.yaml').to_meta_config_yaml(8) %>
       documentation: Additional parameters are required. Please see the [Interfaces](/docs/v5/interfaces)
         documentation for more details.
-TARGET:
-  summary: Define a target
-  description: Defines a target that the plugin adds to the COSMOS system.  Targets are entities that COSMOS can send commands to and receive telemetry from.
-  parameters:
-    - name: Target Folder Name
-      description: The exact name of the target folder in the plugin. ie. targets/<Target Folder Name>
-      required: true
-      values: .+
-    - name: Target Name
-      description: The specific name of this instance of the target in the COSMOS system
-      required: true
-      values: .+
-MICROSERVICE:
-  summary: Define a microservice
-  description: Defines a microservice that the plugin adds to the COSMOS system.  Microservices are background software processes that perform persistent processing.
-  parameters:
-    - name: Microservice Folder Name
-      description: The exact name of the microservice folder in the plugin. ie. microservices/<Microservice Folder Name>
-      required: true
-      values: .+
-    - name: Microservice Name
-      description: The specific name of this instance of the microservice in the COSMOS system
-      required: true
-      values: .+
-  modifiers:
-    ENV:
-      summary: Sets an environment variable in the microservice.
-      description: Sets an environment variable in the microservice.
-      parameters:
-        - name: Key
-          required: true
-          description: Name of the environment variable
-          values: .+
-        - name: Value
-          required: true
-          description: Value of the environment variable
-          values: .+
-    WORK_DIR:
-      summary: Set the working directory
-      description: Working directory to run the microservice CMD in.  Can be a path relative to the microservice folder in the plugin, or an absolute path in the container the microservice runs in.
-      parameters:
-        - name: Directory
-          required: true
-          description: Working directory to run the microservice CMD in.  Can be a path relative to the microservice folder in the plugin, or an absolute path in the container the microservice runs in.
-          values: .+
-    TOPIC:
-      summary: Associate a Redis topic
-      description: Redis topic to associate with this microservice.  Standard COSMOS microservices such as decom_microservice use this information to know what packet streams to subscribe to.  The TOPIC keyword can be used as many times as necessary to associate all needed topics.
-      parameters:
-        - name: Topic Name
-          required: true
-          description: Redis Topic to associate with the microservice
-          values: .+
-    TARGET_NAME:
-      summary: Associate a COSMOS target
-      description: COSMOS target to associate with the microservice.   For standard COSMOS microservices such as decom_microservice this causes the target configuration to get loaded into the container for the microservice.
-      parameters:
-        - name: Target Name
-          required: true
-          description: COSMOS target to associate with the microservice
-          values: .+
-    CMD:
-      summary: Command line to execute to run the microservice.
-      description: Command line to execute to run the microservice.
-      parameters:
-        - name: Args
-          required: true
-          description: One or more arguments to exec to run the microservice.
-          values: .+
-    CONTAINER:
-      summary: Docker Container.
-      description: Container to execute and run the microservice in.
-      parameters:
-        - name: Args
-          required: false
-          description: Name of the container
-          values: .+
-    OPTION:
-      summary: Pass an option to the microservice
-      description: Generic key/value(s) options to pass to the microservice.  These take the form of KEYWORD/PARAMS like a line in a COSMOS configuration file.  Multiple OPTION keywords can be used to pass multiple options to the microservice.
-      parameters:
-        - name: Option Name
-          required: true
-          description: Name of the option
-          values: .+
-        - name: Option Value(s)
-          required: true
-          description: One or more values to associate with the option
-          values: .+
-TOOL:
-  summary: Define a tool
-  description: Defines a tool that the plugin adds to the COSMOS system.  Tools are web based applications that make use of the Single-SPA javascript library that allows them to by dynamically added to the running system as independent frontend microservices.
-  parameters:
-    - name: Tool Folder Name
-      description: The exact name of the tool folder in the plugin. ie. tools/<Tool Folder Name>
-      required: true
-      values: .+
-    - name: Tool Name
-      description: Name of the tool that is displayed in the COSMOS Navigation menu
-      required: true
-      values: .+
-  modifiers:
-    URL:
-      summary: Url used to access the tool
-      description: The relative url used to access the tool.  Defaults to "/tools/<Tool Folder Name>".
-      parameters:
-        - name: Url
-          required: true
-          description: The url.  If not given defaults to tools/<Tool Folder Name>.  Generally should not be given unless linking to external tools.
-          values: .+
-    INLINE_URL:
-      summary: Internal url to load a tool
-      description: The url of the javascript file used to load the tool into single-SPA.  Defaults to "js/app.js".
-      parameters:
-        - name: Url
-          required: true
-          description: The inline url.  If not given defaults to js/app.js.  Generally should not be given unless using a non-standard filename.
-          values: .+
-    WINDOW:
-      summary: How to display the tool when navigated to
-      description: The window mode used to display the tool.  Currently supported modes are INLINE which opens the tool internally without refreshing the page using the Single-SPA framework, and NEW which opens the tool in a new TAB.   A future release will support IFRAME to open external tools in an Iframe within COSMOS.
-      parameters:
-        - name: Window Mode
-          required: true
-          description: INLINE, NEW, or IFRAME
-          values: .+
-    ICON:
-      summary: Set tool icon
-      description: Icon shown next to the tool name in the COSMOS navigation menu.
-      parameters:
-        - name: Icon Name
-          required: true
-          description: Icon to display next to the tool name.   Icons come from Font Awesome, Material Design, and Astro.  See https://vuetifyjs.com/en/components/icons/
-          values: .+
-    CATEGORY:
-      summary: Category for the tool
-      description: Associates the tool with a category.  In a future release this will be able to organize tools into submenus in the Navigation menu.
-      parameters:
-        - name: Category Name
-          required: true
-          description: Category to associate the tool with
-          values: .+
-    SHOWN:
-      summary: Show the tool or not
-      description: Whether or not the tool is shown in the Navigation menu.   Should generally be true, except for the cosmos base tool.
-      parameters:
-        - name: Shown
-          required: true
-          description: Whether or not the tool is shown.  TRUE or FALSE
-          values: .+
+<%= MetaConfigParser.load('target.yaml').to_meta_config_yaml() %>
+<%= MetaConfigParser.load('microservice.yaml').to_meta_config_yaml() %>
+<%= MetaConfigParser.load('tool.yaml').to_meta_config_yaml() %>

data/data/config/target.yaml

@@ -28,6 +28,13 @@ TARGET:
           required: true
           description: Maximum file size in bytes (default = 50_000_000)
           values: \d+
+    CMD_LOG_RETAIN_TIME:
+      summary: How long to keep raw command logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep raw command logs (default = nil = Forever)
+          values: \d+
     CMD_DECOM_LOG_CYCLE_TIME:
       summary: Command decommutation logs can be cycled on a time interval.
       parameters:
@@ -42,6 +49,13 @@ TARGET:
           required: true
           description: Maximum file size in bytes (default = 50_000_000)
           values: \d+
+    CMD_DECOM_LOG_RETAIN_TIME:
+      summary: How long to keep decom command logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep decom command logs (default = nil = Forever)
+          values: \d+
     TLM_LOG_CYCLE_TIME:
       summary: Telemetry binary logs can be cycled on a time interval.
       parameters:
@@ -56,6 +70,13 @@ TARGET:
           required: true
           description: Maximum file size in bytes (default = 50_000_000)
           values: \d+
+    TLM_LOG_RETAIN_TIME:
+      summary: How long to keep raw telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep raw telemetry logs (default = nil = Forever)
+          values: \d+
     TLM_DECOM_LOG_CYCLE_TIME:
       summary: Telemetry decommutation logs can be cycled on a time interval.
       parameters:
@@ -70,3 +91,52 @@ TARGET:
           required: true
           description: Maximum file size in bytes (default = 50_000_000)
           values: \d+
+    TLM_DECOM_LOG_RETAIN_TIME:
+      summary: How long to keep decom telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep decom telemetry logs (default = nil = Forever)
+          values: \d+
+    REDUCED_MINUTE_LOG_RETAIN_TIME:
+      summary: How long to keep reduced minute telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep reduced minute telemetry logs (default = nil = Forever)
+          values: \d+
+    REDUCED_HOUR_LOG_RETAIN_TIME:
+      summary: How long to keep reduced hour telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep reduced hour telemetry logs (default = nil = Forever)
+          values: \d+
+    REDUCED_DAY_LOG_RETAIN_TIME:
+      summary: How long to keep reduced day telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep reduced day telemetry logs (default = nil = Forever)
+          values: \d+
+    LOG_RETAIN_TIME:
+      summary: How long to keep all regular telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep all regular telemetry logs (default = nil = Forever)
+          values: \d+
+    REDUCED_LOG_RETAIN_TIME:
+      summary: How long to keep all reduced telemetry logs in seconds.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds to keep all reduced telemetry logs (default = nil = Forever)
+          values: \d+
+    CLEANUP_POLL_TIME:
+      summary: Period at which to run the cleanup process.
+      parameters:
+        - name: Time
+          required: true
+          description: Number of seconds between runs of the cleanup process (default = 900 = 15 minutes)
+          values: \d+

data/data/config/tool.yaml

@@ -1,57 +1,63 @@
 ---
 TOOL:
-  summary: Defines a new tool
+  summary: Define a tool
   example: TOOL DEMO Demo
+  description: Defines a tool that the plugin adds to the COSMOS system. Tools are web based applications that make use of the Single-SPA javascript library that allows them to by dynamically added to the running system as independent frontend microservices.
   parameters:
-    - name: Folder Name
+    - name: Tool Folder Name
+      description: The exact name of the tool folder in the plugin. ie. tools/<Tool Folder Name>
       required: true
-      description: The folder where the tool is located relative to the tools folder in the plugin
-      values: .*
-    - name: Name
+      values: .+
+    - name: Tool Name
+      description: Name of the tool that is displayed in the COSMOS Navigation menu
       required: true
-      description: The tool name displayed in the Nav bar
-      values: .*
+      values: .+
   modifiers:
     URL:
-      summary: Url to reach the tool relative to the tools Folder Name, or absolute
+      summary: Url used to access the tool
+      description: The relative url used to access the tool. Defaults to "/tools/<Tool Folder Name>".
       parameters:
-        - name: URL
+        - name: Url
           required: true
-          description: URL
-          values: .*
+          description: The url. If not given defaults to tools/<Tool Folder Name>. Generally should not be given unless linking to external tools.
+          values: .+
     INLINE_URL:
-      summary: Single SPA url to reach the tool
-      example: js/app.js
+      summary: Internal url to load a tool
+      description: The url of the javascript file used to load the tool into single-SPA. Defaults to "js/app.js".
       parameters:
-        - name: URL
+        - name: Url
           required: true
-          description: URL
-          values: .*
-    ICON:
-      summary: Icon used to display the tool link
-      parameters:
-        - name: Name
-          required: true
-          description: Material design icon name (https://materialdesignicons.com/)
-          values: .*
+          description: The inline url. If not given defaults to js/app.js. Generally should not be given unless using a non-standard filename.
+          values: .+
     WINDOW:
-      summary: How the tool should be displayed
+      summary: How to display the tool when navigated to
+      description: The window mode used to display the tool. INLINE opens the tool internally without refreshing the page using the Single-SPA framework. IFRAME opens external tools in an Iframe within COSMOS. NEW opens the tool in a new TAB.
       parameters:
-        - name: Mode
+        - name: Window Mode
           required: true
           description: Tool display mode
           values: ["INLINE", "IFRAME", "NEW"]
+    ICON:
+      summary: Set tool icon
+      description: Icon shown next to the tool name in the COSMOS navigation menu.
+      parameters:
+        - name: Icon Name
+          required: true
+          description: Icon to display next to the tool name. Icons come from Font Awesome, Material Design (https://materialdesignicons.com/), and Astro.
+          values: .+
     CATEGORY:
-      summary: Category to place the tool into
+      summary: Category for the tool
+      description: Associates the tool with a category. In a future release this will be able to organize tools into submenus in the Navigation menu.
       parameters:
-        - name: Category
+        - name: Category Name
           required: true
-          description: Name of a category to organize a tool into
-          values: .*
+          description: Category to associate the tool with
+          values: .+
     SHOWN:
-      summary: Is the Tool Shown in the Nav Bar
+      summary: Show the tool or not
+      description: Whether or not the tool is shown in the Navigation menu. Should generally be true, except for the cosmos base tool.
       parameters:
         - name: Shown
           required: true
-          description: Is Shown?
+          description: Whether or not the tool is shown.  TRUE or FALSE
           values: ["true", "false"]

data/lib/cosmos/api/api.rb

@@ -28,36 +28,12 @@ require 'cosmos/api/settings_api'
 require 'cosmos/api/target_api'
 require 'cosmos/api/tlm_api'
 require 'cosmos/utilities/authorization'
+require 'cosmos/topics/topic'
 
 module Cosmos
   module Api
     include Extract
     include Authorization
     include ApiShared
-
-    # PRIVATE - Shared by cmd_api and tlm_api
-
-    def _get_cnt(topic)
-      _, packet = Store.instance.read_topic_last(topic)
-      packet ? packet["received_count"].to_i : 0
-    end
-
-    def get_all_cmd_tlm_info(type, scope:, token:)
-      authorize(permission: 'system', scope: scope, token: token)
-      result = []
-      keys = []
-      count = 0
-      loop do
-        count, part = Store.scan(0, :match => "#{scope}__#{type}__*", :count => 1000)
-        keys.concat(part)
-        break if count.to_i == 0
-      end
-      keys.each do |key|
-        _, _, target, packet = key.gsub(/{|}/, '').split('__') # split off scope and type
-        result << [target, packet, _get_cnt(key)]
-      end
-      # Return the results sorted by target, packet
-      result.sort_by { |a| [a[0], a[1]] }
-    end
   end
 end

data/lib/cosmos/api/cmd_api.rb

@@ -35,6 +35,7 @@ module Cosmos
                        'cmd_raw_no_checks',
                        'send_raw',
                        'get_all_commands',
+                       'get_all_commands_list',
                        'get_command',
                        'get_parameter',
                        'get_cmd_buffer',
@@ -194,7 +195,7 @@ module Cosmos
       authorize(permission: 'cmd_info', target_name: target_name, packet_name: command_name, scope: scope, token: token)
       TargetModel.packet(target_name, command_name, type: :CMD, scope: scope)
       topic = "#{scope}__COMMAND__{#{target_name}}__#{command_name}"
-      msg_id, msg_hash = Store.instance.read_topic_last(topic)
+      msg_id, msg_hash = Topic.get_newest_message(topic)
       if msg_id
         msg_hash['buffer'] = msg_hash['buffer'].b
         return msg_hash
@@ -212,6 +213,16 @@ module Cosmos
       TargetModel.packets(target_name, type: :CMD, scope: scope)
     end
 
+    # Returns an array of all the command names and their descriptions
+    #
+    # @since 5.0.3
+    # @param target_name [String] Name of the target
+    # @return [Array<Hash>] Array of all commands as a hash
+    def get_all_commands_list(target_name, scope: $cosmos_scope, token: $cosmos_token)
+      authorize(permission: 'cmd_info', target_name: target_name, scope: scope, token: token)
+      TargetModel.all_packet_name_descriptions(target_name, type: :CMD, scope: scope)
+    end
+
     # Returns a hash of the given command
     #
     # @since 5.0.0
@@ -291,7 +302,7 @@ module Cosmos
     # @return [Varies] value
     def get_cmd_value(target_name, command_name, parameter_name, value_type = :CONVERTED, scope: $cosmos_scope, token: $cosmos_token)
       authorize(permission: 'cmd_info', target_name: target_name, packet_name: command_name, scope: scope, token: token)
-      Store.instance.get_cmd_item(target_name, command_name, parameter_name, type: value_type, scope: scope)
+      CommandDecomTopic.get_cmd_item(target_name, command_name, parameter_name, type: value_type, scope: scope)
     end
 
     # Returns the time the most recent command was sent
@@ -304,7 +315,7 @@ module Cosmos
     def get_cmd_time(target_name = nil, command_name = nil, scope: $cosmos_scope, token: $cosmos_token)
       authorize(permission: 'cmd_info', target_name: target_name, packet_name: command_name, scope: scope, token: token)
       if target_name and command_name
-        time = Store.instance.get_cmd_item(target_name, command_name, 'RECEIVED_TIMESECONDS', type: :CONVERTED, scope: scope)
+        time = CommandDecomTopic.get_cmd_item(target_name, command_name, 'RECEIVED_TIMESECONDS', type: :CONVERTED, scope: scope)
         [target_name, command_name, time.to_i, ((time.to_f - time.to_i) * 1_000_000).to_i]
       else
         if target_name.nil?
@@ -316,7 +327,7 @@ module Cosmos
           time = 0
           command_name = nil
           TargetModel.packets(target_name, type: :CMD, scope: scope).each do |packet|
-            cur_time = Store.instance.get_cmd_item(target_name, packet["packet_name"], 'RECEIVED_TIMESECONDS', type: :CONVERTED, scope: scope)
+            cur_time = CommandDecomTopic.get_cmd_item(target_name, packet["packet_name"], 'RECEIVED_TIMESECONDS', type: :CONVERTED, scope: scope)
             next unless cur_time
 
             if cur_time > time
@@ -338,7 +349,7 @@ module Cosmos
     def get_cmd_cnt(target_name, command_name, scope: $cosmos_scope, token: $cosmos_token)
       authorize(permission: 'system', target_name: target_name, packet_name: command_name, scope: scope, token: token)
       TargetModel.packet(target_name, command_name, type: :CMD, scope: scope)
-      _get_cnt("#{scope}__COMMAND__{#{target_name}}__#{command_name}")
+      Topic.get_cnt("#{scope}__COMMAND__{#{target_name}}__#{command_name}")
     end
 
     # Get information on all command packets
@@ -351,7 +362,7 @@ module Cosmos
         TargetModel.packets(target_name, type: :CMD, scope: scope).each do | packet |
           command_name = packet['packet_name']
           key = "#{scope}__COMMAND__{#{target_name}}__#{command_name}"
-          result << [target_name, command_name, _get_cnt(key)]
+          result << [target_name, command_name, Topic.get_cnt(key)]
         end
       end
       # Return the results sorted by target, packet

data/lib/cosmos/api/config_api.rb

@@ -17,6 +17,8 @@
 # enterprise edition license of COSMOS if purchased from the
 # copyright holder
 
+require 'cosmos/models/tool_config_model'
+
 module Cosmos
   module Api
     WHITELIST ||= []
@@ -34,19 +36,23 @@ module Cosmos
     end
 
     def list_configs(tool, scope: $cosmos_scope, token: $cosmos_token)
-      Store.instance.hkeys("#{scope}__config__#{tool}")
+      authorize(permission: 'system', scope: scope, token: token)
+      ToolConfigModel.list_configs(tool, scope: scope)
     end
 
     def load_config(tool, name, scope: $cosmos_scope, token: $cosmos_token)
-      Store.instance.hget("#{scope}__config__#{tool}", name)
+      authorize(permission: 'system', scope: scope, token: token)
+      ToolConfigModel.load_config(tool, name, scope: scope)
     end
 
     def save_config(tool, name, data, scope: $cosmos_scope, token: $cosmos_token)
-      Store.instance.hset("#{scope}__config__#{tool}", name, data)
+      authorize(permission: 'system_set', scope: scope, token: token)
+      ToolConfigModel.save_config(tool, name, data, scope: scope)
     end
 
     def delete_config(tool, name, scope: $cosmos_scope, token: $cosmos_token)
-      Store.instance.hdel("#{scope}__config__#{tool}", name)
+      authorize(permission: 'system_set', scope: scope, token: token)
+      ToolConfigModel.delete_config(tool, name, scope: scope)
     end
   end
 end

data/lib/cosmos/api/limits_api.rb

@@ -64,7 +64,7 @@ module Cosmos
       targets.each do |target_name|
         get_all_telemetry(target_name, scope: scope).each do |packet|
           topic = "#{scope}__TELEMETRY__{#{target_name}}__#{packet['packet_name']}"
-          _, msg_hash = Store.get_newest_message(topic)
+          _, msg_hash = Topic.get_newest_message(topic)
           unless msg_hash && msg_hash['time'].to_i > stale_time
             next if with_limits_only && packet['items'].find { |item| item['limits'] }.nil?