lmcadm 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0dd10565f531737baa49a5fbfef88cd87428354379bfea56479b695f6a9447
-  data.tar.gz: 057bef12dff7c5b8ec69b6f833343789c4682595b6bd99f4dbce64b1a740b6af
+  metadata.gz: 8e0ecc30a7bc65586b2e252af05a701c4facd81c950378d147ccdf1583ee4dac
+  data.tar.gz: a807ad57a2d8d40419b2cf28e0ba997ba800ce6113f496e950c8be6dfa5c95bd
 SHA512:
-  metadata.gz: b4d94f44775a0c2bea6b8e0c7376af6e7b21268670f0bc119e83d1ea2de670e8477012e717eb52df18651af18c51186551e4c71f10bd1d78bf5b4838df486f4f
-  data.tar.gz: f45285b9223ada9c9213f99e351335f59aff2e6f9ee0038b12efe14cec3e8f0bdc6564f87db76082efce72d36128de84e45d2d50ae4414a10170f779fa6edb91
+  metadata.gz: cc6a607055a7c4a02245df5eae5110ed7dc874a3cdd14dc16280082a9066a27f25563fd5a0b95dfc7afdd1a28eaf92531ae0dd1bc7fc776ce6e081693ce63606
+  data.tar.gz: 451a67308f2a0b4420e667019272e33f1a23ee4d2bcf07a56d8ff3d4ccc23fad364cca5a7928010b259ac81fd86db0e658ac3f3845b78672ffa7c0fb39a351a1

data/README.md

@@ -83,7 +83,7 @@ Available types are
 
 Example use:
 
-    lmcadm monitor -A "ExampleProject" raw --type scalar --period MINUTE10 \
+    $ lmcadm monitor -A "ExampleProject" raw --type scalar --period MINUTE10 \
         device_info cloud_rtt.max 3e19ada7-86fa-4809-a14e-7174b018603d
 
 
@@ -94,8 +94,23 @@ To further extract data, use something that can parse json, like `jq`[1].
 
 Example use:
 
-    lmcadm monitor -A "SDN-DEMO (LANCOM Visitor)" raw --type json --period MINUTE1 \
-      wan_info_json interfaces a6871a81-84f3-4c57-a20e-c3410b47e895  | jq ' .[]["DSL-CH-1"].rxRate'
+    $lmcadm monitor -A "ExampleProject" raw --type json --period MINUTE1 \
+       wan_info_json interfaces a6871a81-84f3-4c57-a20e-c3410b47e895  | jq ' .[]["DSL-CH-1"].rxRate'
+
+### --type table
+
+Prints table data as one row per sample.
+Empty row handling is shaky, as is error handling in general.
+
+    $ lmcadm  monitor -A "ExampleProject" raw --type table device_info \
+       device 3a096938-87b4-47c8-a388-fda75f30eacc
+    CLOUD_RTT | CPU_LOAD | UPTIME   | TOTAL_MEMORY | FREE_MEMORY | CONTROL_RX | CONTROL_TX | MONITORING_RX | MONITORING_TX
+    ----------|----------|----------|--------------|-------------|------------|------------|---------------|--------------
+    29        | 1        | 19512712 | 248064       | 27228       | 513704725  | 291602474  | 119108008     | 936963871    
+    29        | 0        | 19512652 | 248064       | 27228       | 513701635  | 291600722  | 119107296     | 936957306    
+    30        | 1        | 19512592 | 248064       | 27228       | 513698545  | 291598970  | 119106584     | 936950729    
+    77        | 6        | 19512533 | 248064       | 27228       | 513695455  | 291597218  | 119105872     | 936944149    
+    ...
 
 # Footnotes
 [1] https://stedolan.github.io/jq/manual/

data/lib/lmcadm/commands/monitor.rb

@@ -83,21 +83,31 @@ module LMCAdm #:nodoc:
           start: startTime.to_i,
           end: endTime.to_i,
         }
+        base_timestamp = result.body.base
+        delta = result.body.delta
         monitordata = result.body.items[name]
         puts result.body.inspect if _g[:debug]
         if options[:type] == 'scalar'
-          puts monitordata.values
+          table_data = monitordata.values.map.with_index { |value, row_index|
+            {
+              timestamp: DateTime.strptime((base_timestamp + delta * (monitordata.values.length - row_index)).to_s,'%s'),
+              value: value,
+            }
+          }
+          tp table_data
         elsif options[:type] == 'json'
           puts JSON.pretty_generate monitordata.to_h[:values]
         elsif options[:type] == 'table'
-          table_data = monitordata.values.map { |v|
-            row = v.first
-            hash = {}
-            monitordata.keys.each_with_index { |k, index|
-              unless row[index].nil?
-                hash[k] = v.first[index]
-              end
-            }
+          table_data = monitordata.values.map.with_index { |v, row_index|
+            hash = { timestamp: DateTime.strptime((base_timestamp + delta * (monitordata.values.length - row_index)).to_s,'%s') }
+            unless v.nil?
+              row = v.first
+              monitordata.keys.each_with_index { |k, column_index|
+                unless row[column_index].nil?
+                  hash[k] = v.first[column_index]
+                end
+              }
+            end
             hash
           }
           tp table_data

data/lib/lmcadm/version.rb

@@ -1,3 +1,3 @@
 module LMCAdm
-  VERSION = '0.18.0'
+  VERSION = '0.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lmcadm
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - erpel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-09 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler