diff options
author | Daniil Baturin <daniil@vyos.io> | 2024-07-03 15:05:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-03 15:05:22 +0200 |
commit | d0bc944526c0c3905fb8bdcf602538465e7d27de (patch) | |
tree | 6a2258443488148cbe6ce15c8f8c3ebb566921c0 /op-mode-definitions | |
parent | e265002fdbac344d58c50b7a6126cb7227db3647 (diff) | |
parent | 7958c9794813f399a2e113896410c0c03d29663d (diff) | |
download | vyos-1x-d0bc944526c0c3905fb8bdcf602538465e7d27de.tar.gz vyos-1x-d0bc944526c0c3905fb8bdcf602538465e7d27de.zip |
Merge pull request #3746 from dmbaturin/T6498-machine-readable-tech-support-report
op-mode: T6498: add machine-readable tech support report script
Diffstat (limited to 'op-mode-definitions')
-rw-r--r-- | op-mode-definitions/generate_tech-support_archive.xml.in | 6 | ||||
-rw-r--r-- | op-mode-definitions/show-techsupport_report.xml.in | 8 |
2 files changed, 11 insertions, 3 deletions
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> <file> <scp://user:passwd@host> <ftp://user:passwd@host></list> + <list> <file> </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> |