Skip to content

Commit 917eb88

Browse files
cglewiscglewis
authored
Merge pull request #1122 from cglewis/master
release v0.5.6
2 parents b884ff9 + 2d4c332 commit 917eb88

File tree

7 files changed

+68
-60
lines changed

7 files changed

+68
-60
lines changed

‎.vent_startup.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
https://github.com/cyberreboot/vent:
22
file_drop:
3-
branch: v0.8.0
3+
branch: v0.8.1
44
build: yes
55
start: yes
66
network_tap:
7-
branch: v0.8.0
7+
branch: v0.8.1
88
build: yes
99
start: yes
1010
rabbitmq:
11-
branch: v0.8.0
11+
branch: v0.8.1
1212
build: yes
1313
start: yes
1414
redis:
15-
branch: v0.8.0
15+
branch: v0.8.1
1616
build: yes
1717
start: yes
1818
rq_dashboard:
19-
branch: v0.8.0
19+
branch: v0.8.1
2020
build: yes
2121
start: yes
2222
rq_worker:
23-
branch: v0.8.0
23+
branch: v0.8.1
2424
build: yes
2525
start: yes
2626
settings:
2727
instances: 4
2828
syslog:
29-
branch: v0.8.0
29+
branch: v0.8.1
3030
build: yes
3131
start: yes
3232
https://github.com/cyberreboot/poseidon:
3333
'@':
34-
branch: v0.5.5
34+
branch: v0.5.6
3535
build: yes
3636
start: yes
3737
api:
38-
branch: v0.5.5
38+
branch: v0.5.6
3939
build: yes
4040
start: yes
4141
https://github.com/cyberreboot/vent-plugins:
4242
pcap_to_node_pcap:
43-
branch: v0.1.0
43+
branch: v0.1.1
4444
build: yes
4545
p0f:
46-
branch: v0.1.0
46+
branch: v0.1.1
4747
build: yes
4848
tcprewrite_dot1q:
49-
branch: v0.1.0
49+
branch: v0.1.1
5050
build: yes
5151
https://github.com/cyberreboot/crviz:
5252
'@':
@@ -55,7 +55,7 @@ https://github.com/cyberreboot/crviz:
5555
start: yes
5656
https://github.com/cyberreboot/poseidonml:
5757
onelayer:
58-
branch: v0.2.9
58+
branch: v0.2.10
5959
build: yes
6060
vent.cfg:
6161
build-options:

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# v0.5.6 (2019-03-22)
2+
3+
- Updated version of redis, pika, pyyaml, scp, pytest
4+
- Cleanly shutdown poseidon container on `poseidon stop`
5+
- Add an experimental `pcap` option to the poseidon command
6+
- Remove BCF filter rules on poseidon stop and remove any previous filters on start
7+
- Cleanup BCF response code when calling the API
8+
19
# v0.5.5 (2019-03-08)
210

311
- Packaged versions of components, including vent-plugins v0.1.0, posiedonml v0.2.9, and vent v0.8.0

‎Makefile‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,36 +39,36 @@ build_debian:
3939
cp .vent_startup.yml installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
4040
cp -R .git installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
4141
cp -R bin/* installers/debian/$(TAG)-$(VERSION)/usr/bin/
42-
docker pull cyberreboot/vent:v0.8.0
43-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.8.0
44-
docker pull cyberreboot/vent-file-drop:v0.8.0
45-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.8.0
46-
docker pull cyberreboot/vent-network-tap:v0.8.0
47-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.8.0
48-
docker pull cyberreboot/vent-rabbitmq:v0.8.0
49-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.8.0
50-
docker pull cyberreboot/vent-redis:v0.8.0
51-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.8.0
52-
docker pull cyberreboot/vent-rq-dashboard:v0.8.0
53-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.8.0
54-
docker pull cyberreboot/vent-rq-worker:v0.8.0
55-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.8.0
56-
docker pull cyberreboot/vent-syslog:v0.8.0
57-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.8.0
58-
docker pull cyberreboot/poseidon-api:v0.5.5
59-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.5.5
60-
docker pull cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.0
61-
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.0
62-
docker pull cyberreboot/vent-plugins-p0f:v0.1.0
63-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar cyberreboot/vent-plugins-p0f:v0.1.0
64-
docker pull cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.0
65-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.0
42+
docker pull cyberreboot/vent:v0.8.1
43+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.8.1
44+
docker pull cyberreboot/vent-file-drop:v0.8.1
45+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.8.1
46+
docker pull cyberreboot/vent-network-tap:v0.8.1
47+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.8.1
48+
docker pull cyberreboot/vent-rabbitmq:v0.8.1
49+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.8.1
50+
docker pull cyberreboot/vent-redis:v0.8.1
51+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.8.1
52+
docker pull cyberreboot/vent-rq-dashboard:v0.8.1
53+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.8.1
54+
docker pull cyberreboot/vent-rq-worker:v0.8.1
55+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.8.1
56+
docker pull cyberreboot/vent-syslog:v0.8.1
57+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.8.1
58+
docker pull cyberreboot/poseidon-api:v0.5.6
59+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.5.6
60+
docker pull cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.1
61+
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
62+
docker pull cyberreboot/vent-plugins-p0f:v0.1.1
63+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar cyberreboot/vent-plugins-p0f:v0.1.1
64+
docker pull cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.1
65+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.1
6666
docker pull cyberreboot/crviz:v0.2.10
6767
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-crviz.tar cyberreboot/crviz:v0.2.10
68-
docker pull cyberreboot/poseidonml-deviceclassifier-onelayer:v0.2.9
69-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidonml-deviceclassifier-onelayer.tar cyberreboot/poseidonml-deviceclassifier-onelayer:v0.2.9
70-
docker pull cyberreboot/poseidon:v0.5.5
71-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.5.5
68+
docker pull cyberreboot/poseidonml-deviceclassifier-onelayer:v0.2.10
69+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidonml-deviceclassifier-onelayer.tar cyberreboot/poseidonml-deviceclassifier-onelayer:v0.2.10
70+
docker pull cyberreboot/poseidon:v0.5.6
71+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.5.6
7272
mkdir -p dist
7373
docker build -t poseidon-dpkg -f Dockerfile.dpkg .
7474
docker run --rm poseidon-dpkg > dist/$(TAG)-$(VERSION).deb
@@ -95,8 +95,8 @@ build_debian_net:
9595
cp .vent_startup.yml installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
9696
cp -R .git installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
9797
cp -R bin/* installers/debian/$(TAG)-$(VERSION)/usr/bin/
98-
docker pull cyberreboot/vent:v0.8.0
99-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.8.0
98+
docker pull cyberreboot/vent:v0.8.1
99+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.8.1
100100
mkdir -p dist
101101
docker build -t poseidon-dpkg --build-arg PKG_NAME=poseidon-net -f Dockerfile.dpkg .
102102
docker run --rm poseidon-dpkg > dist/$(TAG)-$(VERSION)-net.deb

‎VERSION‎

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

‎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.8.0
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.8.1
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.5.6.dev
2+
Version: 0.5.6
33
Section: base
44
Priority: optional
55
Architecture: all

‎installers/debian/postinst‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -201,62 +201,62 @@ if db_go; then
201201

202202
# load or pull required images
203203
if [ ! -f /opt/poseidon/dist/cyberreboot-vent.tar ]; then
204-
docker pull cyberreboot/vent:v0.8.0
204+
docker pull cyberreboot/vent:v0.8.1
205205
else
206206
docker load -i /opt/poseidon/dist/cyberreboot-vent.tar
207207
fi
208208
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-file-drop.tar ]; then
209-
docker pull cyberreboot/vent-file-drop:v0.8.0
209+
docker pull cyberreboot/vent-file-drop:v0.8.1
210210
else
211211
docker load -i /opt/poseidon/dist/cyberreboot-vent-file-drop.tar
212212
fi
213213
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-network-tap.tar ]; then
214-
docker pull cyberreboot/vent-network-tap:v0.8.0
214+
docker pull cyberreboot/vent-network-tap:v0.8.1
215215
else
216216
docker load -i /opt/poseidon/dist/cyberreboot-vent-network-tap.tar
217217
fi
218218
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar ]; then
219-
docker pull cyberreboot/vent-rabbitmq:v0.8.0
219+
docker pull cyberreboot/vent-rabbitmq:v0.8.1
220220
else
221221
docker load -i /opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar
222222
fi
223223
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-redis.tar ]; then
224-
docker pull cyberreboot/vent-redis:v0.8.0
224+
docker pull cyberreboot/vent-redis:v0.8.1
225225
else
226226
docker load -i /opt/poseidon/dist/cyberreboot-vent-redis.tar
227227
fi
228228
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar ]; then
229-
docker pull cyberreboot/vent-rq-dashboard:v0.8.0
229+
docker pull cyberreboot/vent-rq-dashboard:v0.8.1
230230
else
231231
docker load -i /opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar
232232
fi
233233
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rq-worker.tar ]; then
234-
docker pull cyberreboot/vent-rq-worker:v0.8.0
234+
docker pull cyberreboot/vent-rq-worker:v0.8.1
235235
else
236236
docker load -i /opt/poseidon/dist/cyberreboot-vent-rq-worker.tar
237237
fi
238238
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-syslog.tar ]; then
239-
docker pull cyberreboot/vent-syslog:v0.8.0
239+
docker pull cyberreboot/vent-syslog:v0.8.1
240240
else
241241
docker load -i /opt/poseidon/dist/cyberreboot-vent-syslog.tar
242242
fi
243243
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon-api.tar ]; then
244-
docker pull cyberreboot/poseidon-api:v0.5.5
244+
docker pull cyberreboot/poseidon-api:v0.5.6
245245
else
246246
docker load -i /opt/poseidon/dist/cyberreboot-poseidon-api.tar
247247
fi
248248
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-plugins-pcap-to-node-pcap.tar ]; then
249-
docker pull cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.0
249+
docker pull cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.1
250250
else
251251
docker load -i /opt/poseidon/dist/cyberreboot-vent-plugins-pcap-to-node-pcap.tar
252252
fi
253253
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar ]; then
254-
docker pull cyberreboot/vent-plugins-p0f:v0.1.0
254+
docker pull cyberreboot/vent-plugins-p0f:v0.1.1
255255
else
256256
docker load -i /opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar
257257
fi
258258
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar ]; then
259-
docker pull cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.0
259+
docker pull cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.1
260260
else
261261
docker load -i /opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar
262262
fi
@@ -266,12 +266,12 @@ if db_go; then
266266
docker load -i /opt/poseidon/dist/cyberreboot-crviz.tar
267267
fi
268268
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidonml-deviceclassifier-onelayer.tar ]; then
269-
docker pull cyberreboot/poseidonml-deviceclassifier-onelayer:v0.2.9
269+
docker pull cyberreboot/poseidonml-deviceclassifier-onelayer:v0.2.10
270270
else
271271
docker load -i /opt/poseidon/dist/cyberreboot-poseidonml-deviceclassifier-onelayer.tar
272272
fi
273273
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon.tar ]; then
274-
docker pull cyberreboot/poseidon:v0.5.5
274+
docker pull cyberreboot/poseidon:v0.5.6
275275
else
276276
docker load -i /opt/poseidon/dist/cyberreboot-poseidon.tar
277277
fi

0 commit comments

Comments
 (0)