diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..22156ed --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,24 @@ +# Changelog + +All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [1.2.1] - 2023-03-20 +### Changed: + + - Fixed bug in info file function + +## [1.2.0] - 2023-02-23 +### Changed: + + - Changd process lookup to handle single binary deployments + - Clean up info file function + +## [1.1.0] - 2023-01-27 +### Added: + + - CPU dumps + + +## [1.0.0] - 2023-01-09 + + - Initial Release \ No newline at end of file diff --git a/dist/support_bundle b/dist/support_bundle index 2f299ce..16e55de 100755 Binary files a/dist/support_bundle and b/dist/support_bundle differ diff --git a/requirements.txt b/requirements.txt index 469c14c..08c0bfc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ pylint +Pyaml pyinstaller requests tqdm diff --git a/support_bundle.py b/support_bundle.py index 22f85c9..3774b1d 100755 --- a/support_bundle.py +++ b/support_bundle.py @@ -46,14 +46,14 @@ def create_info_file(tmp_dir, email_address): info_items = {"email_address": email_address} info_items["network_version"] = "7" node_type_map = { - "/opt/netfoundry/ziti/ziti-controller/ziti-controller": "NC", - "/opt/netfoundry/ziti/ziti-router/config.yml": "ER", + "/opt/netfoundry/ziti/ziti-controller": "NC", + "/opt/netfoundry/ziti/ziti-router": "ER", } logging.debug("Attempting to identify system...") for file_path, node_type in node_type_map.items(): - if os.path.exists(file_path): + if os.path.isdir(file_path): info_items["node_type"] = node_type logging.debug("Node Type: %s", node_type) break @@ -716,11 +716,9 @@ def main(): # main if __name__ == '__main__': try: - __version__ = '1.2.0' + __version__ = '1.2.1' # change log - # 1.0.0 - initial release - # 1.1.0 - add cpu dump - # 1.2.0 - change process lookup; clean up info file function + # https://github.com/netfoundry/edge-router-support-bundle/blob/main/CHANGELOG.md # argument parser parser = argparse.ArgumentParser()