Merge pull request #1334 from cglewis/master

release v0.7.2
faucetsdn · Sep 17, 2019 · 7d9d908 · 7d9d908
2 parents 9fd65fd + f829fc5
commit 7d9d908
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 45 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.10
+        branch: v0.9.11
         build: yes
         start: yes
     network_tap:
-        branch: v0.9.10
+        branch: v0.9.11
         build: yes
         start: yes
     rabbitmq:
-        branch: v0.9.10
+        branch: v0.9.11
         build: yes
         start: yes
     redis:
-        branch: v0.9.10
+        branch: v0.9.11
         build: yes
         start: yes
     rq_dashboard:
-        branch: v0.9.10
+        branch: v0.9.11
         build: yes
         start: yes
     rq_worker:
-        branch: v0.9.10
+        branch: v0.9.11
         build: yes
         start: yes
         settings:
             instances: 4
     syslog:
-        branch: v0.9.10
+        branch: v0.9.11
         build: yes
         start: yes
 https://github.com/cyberreboot/poseidon:
     '@':
-        branch: v0.7.1
+        branch: v0.7.2
         build: yes
         start: yes
     api:
-        branch: v0.7.1
+        branch: v0.7.2
         build: yes
         start: yes
 https://github.com/cyberreboot/vent-plugins:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v0.7.2 (2019-09-17)
+
+ - Added type entries to history
+ - Fixed an issue where queue was being triggered on inactive endpoints
+ - Fixed the IP for the `run` helper Faucet script
+ - Fixed some instances of the wrong member being called in main
+ - Force triggering a transition when ncaptures complete
+
 # v0.7.1 (2019-09-13)
 
  - Updated versions of pytest and transitions

diff --git a/Makefile b/Makefile
@@ -33,27 +33,27 @@ 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.10
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.10
+	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-file-drop:v0.9.10
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.9.10
-	docker pull cyberreboot/vent-network-tap:v0.9.10
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.9.10
-	docker pull cyberreboot/vent-rabbitmq:v0.9.10
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.9.10
-	docker pull cyberreboot/vent-redis:v0.9.10
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.9.10
-	docker pull cyberreboot/vent-rq-dashboard:v0.9.10
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.9.10
-	docker pull cyberreboot/vent-rq-worker:v0.9.10
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.9.10
-	docker pull cyberreboot/vent-syslog:v0.9.10
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.9.10
-	docker pull cyberreboot/poseidon:v0.7.1
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.7.1
-	docker pull cyberreboot/poseidon-api:v0.7.1
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.7.1
+	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-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
@@ -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.10
-	docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.10
+	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
 
 	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.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
+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
 
 Usage: poseidon [option]
 Options:

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.2.dev
+0.7.2
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.10
+                    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
                     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.1
+Version: 0.7.2
 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.10
+        docker pull cyberreboot/vent:v0.9.11
     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.10
+        docker pull cyberreboot/vent-file-drop:v0.9.11
     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.10
+        docker pull cyberreboot/vent-network-tap:v0.9.11
     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.10
+        docker pull cyberreboot/vent-rabbitmq:v0.9.11
     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.10
+        docker pull cyberreboot/vent-redis:v0.9.11
     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.10
+        docker pull cyberreboot/vent-rq-dashboard:v0.9.11
     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.10
+        docker pull cyberreboot/vent-rq-worker:v0.9.11
     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.10
+        docker pull cyberreboot/vent-syslog:v0.9.11
     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.1
+        docker pull cyberreboot/poseidon:v0.7.2
     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.1
+        docker pull cyberreboot/poseidon-api:v0.7.2
     else
         docker load -i /opt/poseidon/dist/cyberreboot-poseidon-api.tar
     fi