Merge pull request #1359 from cglewis/master

release v0.7.3
faucetsdn · Oct 3, 2019 · 7727459 · 7727459
2 parents 0921440 + 1b11915
commit 7727459
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 55 deletions.
diff --git a/.vent_startup.yml b/.vent_startup.yml
@@ -1,41 +1,41 @@
 https://github.com/cyberreboot/vent:
     file_drop:
-        branch: v0.9.11
+        branch: v0.9.12
         build: yes
         start: yes
     network_tap:
-        branch: v0.9.11
+        branch: v0.9.12
         build: yes
         start: yes
     rabbitmq:
-        branch: v0.9.11
+        branch: v0.9.12
         build: yes
         start: yes
     redis:
-        branch: v0.9.11
+        branch: v0.9.12
         build: yes
         start: yes
     rq_dashboard:
-        branch: v0.9.11
+        branch: v0.9.12
         build: yes
         start: yes
     rq_worker:
-        branch: v0.9.11
+        branch: v0.9.12
         build: yes
         start: yes
         settings:
             instances: 4
     syslog:
-        branch: v0.9.11
+        branch: v0.9.12
         build: yes
         start: yes
 https://github.com/cyberreboot/poseidon:
     '@':
-        branch: v0.7.2
+        branch: v0.7.3
         build: yes
         start: yes
     api:
-        branch: v0.7.2
+        branch: v0.7.3
         build: yes
         start: yes
 https://github.com/cyberreboot/vent-plugins:
@@ -50,12 +50,12 @@ https://github.com/cyberreboot/vent-plugins:
         build: yes
 https://github.com/cyberreboot/crviz:
     '@':
-        branch: v0.3.11
+        branch: v0.3.12
         build: yes
         start: yes
 https://github.com/cyberreboot/networkml:
     '@':
-        branch: v0.3.8
+        branch: v0.3.9
         build: yes
 vent.cfg:
     build-options:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# v0.7.3 (2019-10-03)
+
+- Updated versions of urllib3, pytest, grafana, cmd2, and pylint
+- Now uses the auto revert feature of Faucet when using the helper run script
+- Endpoints are now a dictionary instead of a list to prevent duplicates
+- Fixed an issue where messages from ncapture weren't being handled correctly
+- Fixed an issue where the investigations count could be wrong
+- Resets the debconf response for collector_nics when not in use
+- Debconf option for setting the reinvestigation frequency
+- Fixed viz command for Poseidon script
+- Handle IP addresses being None
+- Better diff of when endpoints change
+
 # v0.7.2 (2019-09-17)
 
  - Added type entries to history

diff --git a/Makefile b/Makefile
@@ -33,37 +33,37 @@ build_debian:
 	cp .vent_startup.yml installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
 	cp -R .git installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
 	cp -R bin/* installers/debian/$(TAG)-$(VERSION)/usr/bin/
-	docker pull cyberreboot/vent:v0.9.11
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.11
+	docker pull cyberreboot/vent:v0.9.12
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.12
 
-	docker pull cyberreboot/vent-file-drop:v0.9.11
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.9.11
-	docker pull cyberreboot/vent-network-tap:v0.9.11
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.9.11
-	docker pull cyberreboot/vent-rabbitmq:v0.9.11
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.9.11
-	docker pull cyberreboot/vent-redis:v0.9.11
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.9.11
-	docker pull cyberreboot/vent-rq-dashboard:v0.9.11
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.9.11
-	docker pull cyberreboot/vent-rq-worker:v0.9.11
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.9.11
-	docker pull cyberreboot/vent-syslog:v0.9.11
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.9.11
-	docker pull cyberreboot/poseidon:v0.7.2
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.7.2
-	docker pull cyberreboot/poseidon-api:v0.7.2
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.7.2
+	docker pull cyberreboot/vent-file-drop:v0.9.12
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.9.12
+	docker pull cyberreboot/vent-network-tap:v0.9.12
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.9.12
+	docker pull cyberreboot/vent-rabbitmq:v0.9.12
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.9.12
+	docker pull cyberreboot/vent-redis:v0.9.12
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.9.12
+	docker pull cyberreboot/vent-rq-dashboard:v0.9.12
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.9.12
+	docker pull cyberreboot/vent-rq-worker:v0.9.12
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.9.12
+	docker pull cyberreboot/vent-syslog:v0.9.12
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.9.12
+	docker pull cyberreboot/poseidon:v0.7.3
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.7.3
+	docker pull cyberreboot/poseidon-api:v0.7.3
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.7.3
 	docker pull cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.4
 	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-pcap-to-node-pcap.tar cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.4
 	docker pull cyberreboot/vent-plugins-p0f:v0.1.4
 	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar cyberreboot/vent-plugins-p0f:v0.1.4
 	docker pull cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.4
 	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.4
-	docker pull cyberreboot/crviz:v0.3.11
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-crviz.tar cyberreboot/crviz:v0.3.11
-	docker pull cyberreboot/networkml:v0.3.8
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-networkml.tar cyberreboot/networkml:v0.3.8
+	docker pull cyberreboot/crviz:v0.3.12
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-crviz.tar cyberreboot/crviz:v0.3.12
+	docker pull cyberreboot/networkml:v0.3.9
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-networkml.tar cyberreboot/networkml:v0.3.9
 
 	mkdir -p dist
 	docker build -t poseidon-dpkg -f Dockerfile.dpkg .
@@ -91,8 +91,8 @@ build_debian_net:
 	cp .vent_startup.yml installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
 	cp -R .git installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
 	cp -R bin/* installers/debian/$(TAG)-$(VERSION)/usr/bin/
-	docker pull cyberreboot/vent:v0.9.11
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.11
+	docker pull cyberreboot/vent:v0.9.12
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.12
 
 	mkdir -p dist
 	docker build -t poseidon-dpkg --build-arg PKG_NAME=poseidon-net -f Dockerfile.dpkg .

diff --git a/README.md b/README.md
@@ -152,7 +152,7 @@ NEW: If you have used the .DEB installer previously, it is worth noting that Pos
 After installation you'll have a new command `poseidon` available for looking at the status, logs, changing the configuration, or stopping and starting the service.
 ```
 $ poseidon help
-Poseidon 0.7.2, an application that leverages software defined networks (SDN) to acquire and then feed network traffic to a number of machine learning techniques. For more info visit: https://github.com/CyberReboot/poseidon
+Poseidon 0.7.3, an application that leverages software defined networks (SDN) to acquire and then feed network traffic to a number of machine learning techniques. For more info visit: https://github.com/CyberReboot/poseidon
 
 Usage: poseidon [option]
 Options:

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.3.dev
+0.7.3
diff --git a/bin/poseidon b/bin/poseidon
@@ -134,7 +134,7 @@ function check_args()
                     echo "Checking volumes..."
                     check_files
                     echo "Starting Poseidon..."
-                    docker run -dit --rm -v /var/run/docker.sock:/var/run/docker.sock -v /opt/vent_files:/opt/vent_files -v /opt/poseidon/.plugin_config.yml:/root/.plugin_config.yml -v /opt/poseidon/.vent_startup.yml:/root/.vent_startup.yml --env-file /etc/poseidon/default.conf --name vent cyberreboot/vent:v0.9.11
+                    docker run -dit --rm -v /var/run/docker.sock:/var/run/docker.sock -v /opt/vent_files:/opt/vent_files -v /opt/poseidon/.plugin_config.yml:/root/.plugin_config.yml -v /opt/poseidon/.vent_startup.yml:/root/.vent_startup.yml --env-file /etc/poseidon/default.conf --name vent cyberreboot/vent:v0.9.12
                     until [ "$(docker ps -q -f name=-poseidon-)" ] && [ "$(docker ps -q -f name=-poseidon- | head -1 | xargs docker container inspect -f \{\{.State.Health.Status\}\})" = "healthy" ]
                     do
                         # TODO do more checks and be verbose in here

diff --git a/installers/debian/control b/installers/debian/control
@@ -1,5 +1,5 @@
 Package: poseidon
-Version: 0.7.3.dev
+Version: 0.7.3
 Section: base
 Priority: optional
 Architecture: all

diff --git a/installers/debian/postinst b/installers/debian/postinst
@@ -239,52 +239,52 @@ if db_go; then
 
     # load or pull required images
     if [ ! -f /opt/poseidon/dist/cyberreboot-vent.tar ]; then
-        docker pull cyberreboot/vent:v0.9.11
+        docker pull cyberreboot/vent:v0.9.12
     else
         docker load -i /opt/poseidon/dist/cyberreboot-vent.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-vent-file-drop.tar ]; then
-        docker pull cyberreboot/vent-file-drop:v0.9.11
+        docker pull cyberreboot/vent-file-drop:v0.9.12
     else
         docker load -i /opt/poseidon/dist/cyberreboot-vent-file-drop.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-vent-network-tap.tar ]; then
-        docker pull cyberreboot/vent-network-tap:v0.9.11
+        docker pull cyberreboot/vent-network-tap:v0.9.12
     else
         docker load -i /opt/poseidon/dist/cyberreboot-vent-network-tap.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar ]; then
-        docker pull cyberreboot/vent-rabbitmq:v0.9.11
+        docker pull cyberreboot/vent-rabbitmq:v0.9.12
     else
         docker load -i /opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-vent-redis.tar ]; then
-        docker pull cyberreboot/vent-redis:v0.9.11
+        docker pull cyberreboot/vent-redis:v0.9.12
     else
         docker load -i /opt/poseidon/dist/cyberreboot-vent-redis.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar ]; then
-        docker pull cyberreboot/vent-rq-dashboard:v0.9.11
+        docker pull cyberreboot/vent-rq-dashboard:v0.9.12
     else
         docker load -i /opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rq-worker.tar ]; then
-        docker pull cyberreboot/vent-rq-worker:v0.9.11
+        docker pull cyberreboot/vent-rq-worker:v0.9.12
     else
         docker load -i /opt/poseidon/dist/cyberreboot-vent-rq-worker.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-vent-syslog.tar ]; then
-        docker pull cyberreboot/vent-syslog:v0.9.11
+        docker pull cyberreboot/vent-syslog:v0.9.12
     else
         docker load -i /opt/poseidon/dist/cyberreboot-vent-syslog.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon.tar ]; then
-        docker pull cyberreboot/poseidon:v0.7.2
+        docker pull cyberreboot/poseidon:v0.7.3
     else
         docker load -i /opt/poseidon/dist/cyberreboot-poseidon.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon-api.tar ]; then
-        docker pull cyberreboot/poseidon-api:v0.7.2
+        docker pull cyberreboot/poseidon-api:v0.7.3
     else
         docker load -i /opt/poseidon/dist/cyberreboot-poseidon-api.tar
     fi
@@ -304,12 +304,12 @@ if db_go; then
         docker load -i /opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-crviz.tar ]; then
-        docker pull cyberreboot/crviz:v0.3.11
+        docker pull cyberreboot/crviz:v0.3.12
     else
         docker load -i /opt/poseidon/dist/cyberreboot-crviz.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-networkml.tar ]; then
-        docker pull cyberreboot/networkml:v0.3.8
+        docker pull cyberreboot/networkml:v0.3.9
     else
         docker load -i /opt/poseidon/dist/cyberreboot-networkml.tar
     fi

diff --git a/release/templates/bin_poseidon b/release/templates/bin_poseidon
@@ -158,11 +158,13 @@ function check_args()
             -v|viz|visualize)
                 if [ "$$(docker ps -q --filter "label=vent.namespace=cyberreboot/crviz" --filter "label=vent.name=" | wc -l)" -eq 1 ]; then
                     port_map=$$(docker port "$$(docker ps -q --filter "label=vent.namespace=cyberreboot/crviz" --filter "label=vent.name=")" 5000/tcp)
+                    api_port_map=$$(docker port "$$(docker ps -q --filter "label=vent.namespace=cyberreboot/poseidon" --filter "label=vent.name=api")" 8000/tcp)
                     port=$$(echo "$$port_map" | cut -d':' -f2)
+                    api_port=$$(echo "$$api_port_map" | cut -d':' -f2)
                     default_iface=$$(awk '$$2 == 00000000 { print $$1 }' /proc/net/route)
                     default_ip=$$(ip addr show dev "$$default_iface" | awk '$$1 ~ /^inet/ { sub("/.*", "", $$2); print $$2 }' | head -1)
-                    echo "CRviz is connected to Poseidon and accessible here: http://$$default_ip:$$port/"
-                    echo "In the Dataset dropdown, select Poseidon Network."
+                    echo "CRviz is connected to Poseidon and accessible here:"
+                    echo "http://$$default_ip:$$port/?dataSourceName=Poseidon Network&dataSourceUrl=http://$$default_ip:$$api_port/v1/network"
                 else
                     echo "CRviz is not running."
                 fi