Merge pull request #1217 from cglewis/master

release v0.6.1

Author: cglewis

.vent_startup.yml

@@ -1,41 +1,41 @@
 https://github.com/cyberreboot/vent:
     file_drop:
-        branch: v0.9.1
+        branch: v0.9.2
         build: yes
         start: yes
     network_tap:
-        branch: v0.9.1
+        branch: v0.9.2
         build: yes
         start: yes
     rabbitmq:
-        branch: v0.9.1
+        branch: v0.9.2
         build: yes
         start: yes
     redis:
-        branch: v0.9.1
+        branch: v0.9.2
         build: yes
         start: yes
     rq_dashboard:
-        branch: v0.9.1
+        branch: v0.9.2
         build: yes
         start: yes
     rq_worker:
-        branch: v0.9.1
+        branch: v0.9.2
         build: yes
         start: yes
         settings:
             instances: 4
     syslog:
-        branch: v0.9.1
+        branch: v0.9.2
         build: yes
         start: yes
 https://github.com/cyberreboot/poseidon:
     '@':
-        branch: v0.6.0
+        branch: v0.6.1
         build: yes
         start: yes
     api:
-        branch: v0.6.0
+        branch: v0.6.1
         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.2.11
+        branch: v0.3.3
         build: yes
         start: yes
 https://github.com/cyberreboot/poseidonml:
     '@':
-        branch: v0.3.1
+        branch: v0.3.2
         build: yes
 vent.cfg:
     build-options:

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.6.1 (2019-05-31)
+
+ - Packaged new version of components, including vent v0.9.2, CRviz v0.3.3, and PoseidonML v0.3.2
+ - Updated verrsions of urllib3, requests, and flask
+ - Fixed a bug where subnet could get set to './24'
+
 # v0.6.0 (2019-05-13)
 
  - Packaged new version of components, including vent v0.9.1

Makefile

@@ -33,36 +33,36 @@ 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.1
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.1
-	docker pull cyberreboot/vent-file-drop:v0.9.1
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.9.1
-	docker pull cyberreboot/vent-network-tap:v0.9.1
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.9.1
-	docker pull cyberreboot/vent-rabbitmq:v0.9.1
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.9.1
-	docker pull cyberreboot/vent-redis:v0.9.1
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.9.1
-	docker pull cyberreboot/vent-rq-dashboard:v0.9.1
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.9.1
-	docker pull cyberreboot/vent-rq-worker:v0.9.1
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.9.1
-	docker pull cyberreboot/vent-syslog:v0.9.1
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.9.1
-	docker pull cyberreboot/poseidon-api:v0.6.0
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.6.0
+	docker pull cyberreboot/vent:v0.9.2
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.2
+	docker pull cyberreboot/vent-file-drop:v0.9.2
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.9.2
+	docker pull cyberreboot/vent-network-tap:v0.9.2
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.9.2
+	docker pull cyberreboot/vent-rabbitmq:v0.9.2
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.9.2
+	docker pull cyberreboot/vent-redis:v0.9.2
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.9.2
+	docker pull cyberreboot/vent-rq-dashboard:v0.9.2
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.9.2
+	docker pull cyberreboot/vent-rq-worker:v0.9.2
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.9.2
+	docker pull cyberreboot/vent-syslog:v0.9.2
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.9.2
+	docker pull cyberreboot/poseidon-api:v0.6.1
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.6.1
 	docker pull cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.1
 	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.1
 	docker pull cyberreboot/vent-plugins-p0f:v0.1.1
 	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar cyberreboot/vent-plugins-p0f:v0.1.1
 	docker pull cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.1
 	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.1
-	docker pull cyberreboot/crviz:v0.2.11
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-crviz.tar cyberreboot/crviz:v0.2.11
-	docker pull cyberreboot/poseidonml:v0.3.1
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidonml.tar cyberreboot/poseidonml:v0.3.1
-	docker pull cyberreboot/poseidon:v0.6.0
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.6.0
+	docker pull cyberreboot/crviz:v0.3.3
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-crviz.tar cyberreboot/crviz:v0.3.3
+	docker pull cyberreboot/poseidonml:v0.3.2
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidonml.tar cyberreboot/poseidonml:v0.3.2
+	docker pull cyberreboot/poseidon:v0.6.1
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.6.1
 	mkdir -p dist
 	docker build -t poseidon-dpkg -f Dockerfile.dpkg .
 	docker run --rm poseidon-dpkg > dist/$(TAG)-$(VERSION).deb
@@ -89,8 +89,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.1
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.1
+	docker pull cyberreboot/vent:v0.9.2
+	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.2
 	mkdir -p dist
 	docker build -t poseidon-dpkg --build-arg PKG_NAME=poseidon-net -f Dockerfile.dpkg .
 	docker run --rm poseidon-dpkg > dist/$(TAG)-$(VERSION)-net.deb

README.md

@@ -153,7 +153,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.6.0, 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.6.1, 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:

VERSION

@@ -1 +1 @@
-0.6.1.dev
+0.6.1

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.1
+                    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.2
                     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

installers/debian/control

@@ -1,5 +1,5 @@
 Package: poseidon
-Version: 0.6.1.dev
+Version: 0.6.1
 Section: base
 Priority: optional
 Architecture: all

installers/debian/postinst

@@ -239,47 +239,47 @@ if db_go; then
 
     # load or pull required images
     if [ ! -f /opt/poseidon/dist/cyberreboot-vent.tar ]; then
-        docker pull cyberreboot/vent:v0.9.1
+        docker pull cyberreboot/vent:v0.9.2
     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.1
+        docker pull cyberreboot/vent-file-drop:v0.9.2
     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.1
+        docker pull cyberreboot/vent-network-tap:v0.9.2
     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.1
+        docker pull cyberreboot/vent-rabbitmq:v0.9.2
     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.1
+        docker pull cyberreboot/vent-redis:v0.9.2
     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.1
+        docker pull cyberreboot/vent-rq-dashboard:v0.9.2
     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.1
+        docker pull cyberreboot/vent-rq-worker:v0.9.2
     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.1
+        docker pull cyberreboot/vent-syslog:v0.9.2
     else
         docker load -i /opt/poseidon/dist/cyberreboot-vent-syslog.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon-api.tar ]; then
-        docker pull cyberreboot/poseidon-api:v0.6.0
+        docker pull cyberreboot/poseidon-api:v0.6.1
     else
         docker load -i /opt/poseidon/dist/cyberreboot-poseidon-api.tar
     fi
@@ -299,17 +299,17 @@ 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.2.11
+        docker pull cyberreboot/crviz:v0.3.3
     else
         docker load -i /opt/poseidon/dist/cyberreboot-crviz.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-poseidonml.tar ]; then
-        docker pull cyberreboot/poseidonml:v0.3.1
+        docker pull cyberreboot/poseidonml:v0.3.2
     else
         docker load -i /opt/poseidon/dist/cyberreboot-poseidonml.tar
     fi
     if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon.tar ]; then
-        docker pull cyberreboot/poseidon:v0.6.0
+        docker pull cyberreboot/poseidon:v0.6.1
     else
         docker load -i /opt/poseidon/dist/cyberreboot-poseidon.tar
     fi