Skip to content

Commit 7d9d908

Browse files
cglewiscglewis
authored
Merge pull request #1334 from cglewis/master
release v0.7.2
2 parents 9fd65fd + f829fc5 commit 7d9d908

File tree

8 files changed

+53
-45
lines changed

8 files changed

+53
-45
lines changed

‎.vent_startup.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
https://github.com/cyberreboot/vent:
22
file_drop:
3-
branch: v0.9.10
3+
branch: v0.9.11
44
build: yes
55
start: yes
66
network_tap:
7-
branch: v0.9.10
7+
branch: v0.9.11
88
build: yes
99
start: yes
1010
rabbitmq:
11-
branch: v0.9.10
11+
branch: v0.9.11
1212
build: yes
1313
start: yes
1414
redis:
15-
branch: v0.9.10
15+
branch: v0.9.11
1616
build: yes
1717
start: yes
1818
rq_dashboard:
19-
branch: v0.9.10
19+
branch: v0.9.11
2020
build: yes
2121
start: yes
2222
rq_worker:
23-
branch: v0.9.10
23+
branch: v0.9.11
2424
build: yes
2525
start: yes
2626
settings:
2727
instances: 4
2828
syslog:
29-
branch: v0.9.10
29+
branch: v0.9.11
3030
build: yes
3131
start: yes
3232
https://github.com/cyberreboot/poseidon:
3333
'@':
34-
branch: v0.7.1
34+
branch: v0.7.2
3535
build: yes
3636
start: yes
3737
api:
38-
branch: v0.7.1
38+
branch: v0.7.2
3939
build: yes
4040
start: yes
4141
https://github.com/cyberreboot/vent-plugins:

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# v0.7.2 (2019-09-17)
2+
3+
- Added type entries to history
4+
- Fixed an issue where queue was being triggered on inactive endpoints
5+
- Fixed the IP for the `run` helper Faucet script
6+
- Fixed some instances of the wrong member being called in main
7+
- Force triggering a transition when ncaptures complete
8+
19
# v0.7.1 (2019-09-13)
210

311
- Updated versions of pytest and transitions

‎Makefile‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,27 @@ build_debian:
3333
cp .vent_startup.yml installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
3434
cp -R .git installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
3535
cp -R bin/* installers/debian/$(TAG)-$(VERSION)/usr/bin/
36-
docker pull cyberreboot/vent:v0.9.10
37-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.10
36+
docker pull cyberreboot/vent:v0.9.11
37+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.11
3838

39-
docker pull cyberreboot/vent-file-drop:v0.9.10
40-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.9.10
41-
docker pull cyberreboot/vent-network-tap:v0.9.10
42-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.9.10
43-
docker pull cyberreboot/vent-rabbitmq:v0.9.10
44-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.9.10
45-
docker pull cyberreboot/vent-redis:v0.9.10
46-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.9.10
47-
docker pull cyberreboot/vent-rq-dashboard:v0.9.10
48-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.9.10
49-
docker pull cyberreboot/vent-rq-worker:v0.9.10
50-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.9.10
51-
docker pull cyberreboot/vent-syslog:v0.9.10
52-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.9.10
53-
docker pull cyberreboot/poseidon:v0.7.1
54-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.7.1
55-
docker pull cyberreboot/poseidon-api:v0.7.1
56-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.7.1
39+
docker pull cyberreboot/vent-file-drop:v0.9.11
40+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.9.11
41+
docker pull cyberreboot/vent-network-tap:v0.9.11
42+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.9.11
43+
docker pull cyberreboot/vent-rabbitmq:v0.9.11
44+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.9.11
45+
docker pull cyberreboot/vent-redis:v0.9.11
46+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.9.11
47+
docker pull cyberreboot/vent-rq-dashboard:v0.9.11
48+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.9.11
49+
docker pull cyberreboot/vent-rq-worker:v0.9.11
50+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.9.11
51+
docker pull cyberreboot/vent-syslog:v0.9.11
52+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.9.11
53+
docker pull cyberreboot/poseidon:v0.7.2
54+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.7.2
55+
docker pull cyberreboot/poseidon-api:v0.7.2
56+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.7.2
5757
docker pull cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.4
5858
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
5959
docker pull cyberreboot/vent-plugins-p0f:v0.1.4
@@ -91,8 +91,8 @@ build_debian_net:
9191
cp .vent_startup.yml installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
9292
cp -R .git installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
9393
cp -R bin/* installers/debian/$(TAG)-$(VERSION)/usr/bin/
94-
docker pull cyberreboot/vent:v0.9.10
95-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.10
94+
docker pull cyberreboot/vent:v0.9.11
95+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.11
9696

9797
mkdir -p dist
9898
docker build -t poseidon-dpkg --build-arg PKG_NAME=poseidon-net -f Dockerfile.dpkg .

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ NEW: If you have used the .DEB installer previously, it is worth noting that Pos
152152
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.
153153
```
154154
$ poseidon help
155-
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
155+
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
156156
157157
Usage: poseidon [option]
158158
Options:

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.7.2.dev
1+
0.7.2

‎bin/poseidon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ function check_args()
134134
echo "Checking volumes..."
135135
check_files
136136
echo "Starting Poseidon..."
137-
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
137+
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
138138
until [ "$(docker ps -q -f name=-poseidon-)" ] && [ "$(docker ps -q -f name=-poseidon- | head -1 | xargs docker container inspect -f \{\{.State.Health.Status\}\})" = "healthy" ]
139139
do
140140
# TODO do more checks and be verbose in here

‎installers/debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: poseidon
2-
Version: 0.7.1
2+
Version: 0.7.2
33
Section: base
44
Priority: optional
55
Architecture: all

‎installers/debian/postinst‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -239,52 +239,52 @@ if db_go; then
239239

240240
# load or pull required images
241241
if [ ! -f /opt/poseidon/dist/cyberreboot-vent.tar ]; then
242-
docker pull cyberreboot/vent:v0.9.10
242+
docker pull cyberreboot/vent:v0.9.11
243243
else
244244
docker load -i /opt/poseidon/dist/cyberreboot-vent.tar
245245
fi
246246
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-file-drop.tar ]; then
247-
docker pull cyberreboot/vent-file-drop:v0.9.10
247+
docker pull cyberreboot/vent-file-drop:v0.9.11
248248
else
249249
docker load -i /opt/poseidon/dist/cyberreboot-vent-file-drop.tar
250250
fi
251251
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-network-tap.tar ]; then
252-
docker pull cyberreboot/vent-network-tap:v0.9.10
252+
docker pull cyberreboot/vent-network-tap:v0.9.11
253253
else
254254
docker load -i /opt/poseidon/dist/cyberreboot-vent-network-tap.tar
255255
fi
256256
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar ]; then
257-
docker pull cyberreboot/vent-rabbitmq:v0.9.10
257+
docker pull cyberreboot/vent-rabbitmq:v0.9.11
258258
else
259259
docker load -i /opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar
260260
fi
261261
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-redis.tar ]; then
262-
docker pull cyberreboot/vent-redis:v0.9.10
262+
docker pull cyberreboot/vent-redis:v0.9.11
263263
else
264264
docker load -i /opt/poseidon/dist/cyberreboot-vent-redis.tar
265265
fi
266266
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar ]; then
267-
docker pull cyberreboot/vent-rq-dashboard:v0.9.10
267+
docker pull cyberreboot/vent-rq-dashboard:v0.9.11
268268
else
269269
docker load -i /opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar
270270
fi
271271
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rq-worker.tar ]; then
272-
docker pull cyberreboot/vent-rq-worker:v0.9.10
272+
docker pull cyberreboot/vent-rq-worker:v0.9.11
273273
else
274274
docker load -i /opt/poseidon/dist/cyberreboot-vent-rq-worker.tar
275275
fi
276276
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-syslog.tar ]; then
277-
docker pull cyberreboot/vent-syslog:v0.9.10
277+
docker pull cyberreboot/vent-syslog:v0.9.11
278278
else
279279
docker load -i /opt/poseidon/dist/cyberreboot-vent-syslog.tar
280280
fi
281281
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon.tar ]; then
282-
docker pull cyberreboot/poseidon:v0.7.1
282+
docker pull cyberreboot/poseidon:v0.7.2
283283
else
284284
docker load -i /opt/poseidon/dist/cyberreboot-poseidon.tar
285285
fi
286286
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon-api.tar ]; then
287-
docker pull cyberreboot/poseidon-api:v0.7.1
287+
docker pull cyberreboot/poseidon-api:v0.7.2
288288
else
289289
docker load -i /opt/poseidon/dist/cyberreboot-poseidon-api.tar
290290
fi

0 commit comments

Comments
 (0)