From 7958c9794813f399a2e113896410c0c03d29663d Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Mon, 1 Jul 2024 12:56:25 +0100
Subject: op-mode: T6498: add machine-readable tech support report script

---
 op-mode-definitions/generate_tech-support_archive.xml.in | 6 +++---
 op-mode-definitions/show-techsupport_report.xml.in       | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/generate_tech-support_archive.xml.in b/op-mode-definitions/generate_tech-support_archive.xml.in
index e95be3e28..fc664eb90 100644
--- a/op-mode-definitions/generate_tech-support_archive.xml.in
+++ b/op-mode-definitions/generate_tech-support_archive.xml.in
@@ -11,16 +11,16 @@
             <properties>
               <help>Generate tech support archive</help>
             </properties>
-            <command>sudo ${vyos_op_scripts_dir}/generate_tech-support_archive.py</command>
+            <command>sudo ${vyos_op_scripts_dir}/tech_support.py show --raw | gzip> $4.json.gz</command>
           </node>
           <tagNode name="archive">
             <properties>
               <help>Generate tech support archive to defined location</help>
               <completionHelp>
-                <list> &lt;file&gt; &lt;scp://user:passwd@host&gt; &lt;ftp://user:passwd@host&gt;</list>
+                <list> &lt;file&gt; </list>
               </completionHelp>
             </properties>
-            <command>sudo ${vyos_op_scripts_dir}/generate_tech-support_archive.py $4</command>
+            <command>sudo ${vyos_op_scripts_dir}/tech_support.py show --raw | gzip > $4.json.gz</command>
           </tagNode>
         </children>
       </node>
diff --git a/op-mode-definitions/show-techsupport_report.xml.in b/op-mode-definitions/show-techsupport_report.xml.in
index ef051e940..4fd6e5d1e 100644
--- a/op-mode-definitions/show-techsupport_report.xml.in
+++ b/op-mode-definitions/show-techsupport_report.xml.in
@@ -12,6 +12,14 @@
               <help>Show consolidated tech-support report (contains private information)</help>
             </properties>
             <command>${vyos_op_scripts_dir}/show_techsupport_report.py</command>
+            <children>
+              <node name="machine-readable">
+                <properties>
+                  <help>Show consolidated tech-support report in JSON</help>
+                </properties>
+                <command>sudo ${vyos_op_scripts_dir}/tech_support.py show --raw</command>
+              </node>
+            </children>
           </node>
         </children>
       </node>
-- 
cgit v1.2.3