From 0763f9335efceb66784fc97bb0868398e32dfbdb Mon Sep 17 00:00:00 2001 From: Scott Piper Date: Fri, 19 Jun 2020 08:21:46 -0600 Subject: [PATCH 1/3] Removed build status badge as it always shows failing and I don't know how to fix it; Resolves #715 --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index e25d0c8e6..345ca6b70 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ CloudMapper ======== -[![Build Status](https://travis-ci.org/duo-labs/cloudmapper.svg?branch=master)](https://travis-ci.org/duo-labs/cloudmapper) - CloudMapper helps you analyze your Amazon Web Services (AWS) environments. The original purpose was to generate network diagrams and display them in your browser. It now contains much more functionality, including auditing for security issues. - [Network mapping demo](https://duo-labs.github.io/cloudmapper/) From ac9b9186e5382a6dbcbc5889ebfff0b4c36f1c4f Mon Sep 17 00:00:00 2001 From: Scott Piper Date: Fri, 19 Jun 2020 08:46:33 -0600 Subject: [PATCH 2/3] Bump versionl; resolves #701 --- cloudmapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudmapper.py b/cloudmapper.py index 44047d186..178f280a7 100755 --- a/cloudmapper.py +++ b/cloudmapper.py @@ -30,7 +30,7 @@ import pkgutil import importlib -__version__ = "2.8.2" +__version__ = "2.9.0" def show_help(commands): From 195f03dfdad933f238ef52327118accb41a62ea8 Mon Sep 17 00:00:00 2001 From: Scott Piper Date: Fri, 19 Jun 2020 10:22:53 -0600 Subject: [PATCH 3/3] Fix requirements for stats and a bug. Resolves what PR #710 was seeking to do --- requirements.txt | 3 +++ stats_config.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ff2004332..f2964e6c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,10 +13,12 @@ Jinja2==2.10.1 jmespath==0.9.5 lazy-object-proxy==1.4.3 MarkupSafe==1.1.1 +matplotlib==3.2.2 mccabe==0.6.1 mock==4.0.2 netaddr==0.7.19 nose==1.3.7 +pandas==1.0.4 parliament==0.3.6 policyuniverse==1.1.0.1 pycodestyle==2.5.0 @@ -27,6 +29,7 @@ python-dateutil==2.8.1 PyYAML==4.2b4 requests==2.22.0 s3transfer==0.2.1 +seaborn==0.10.1 six==1.14.0 toml==0.10.0 typed-ast==1.4.1 diff --git a/stats_config.yaml b/stats_config.yaml index d09eaffda..78993d1cd 100644 --- a/stats_config.yaml +++ b/stats_config.yaml @@ -2,7 +2,7 @@ query: .Buckets|length source: s3-list-buckets - name: EC2 instances - query: '[.Reservations[].Instances[]|select(.State.Name == "running")]|length' + query: '[.Reservations[]?.Instances[]?|select(.State.Name == "running")]|length' source: ec2-describe-instances - name: ELBs query: .LoadBalancerDescriptions|length