Skip to content

Commit 7727459

Browse files
cglewiscglewis
authored
Merge pull request #1359 from cglewis/master
release v0.7.3
2 parents 0921440 + 1b11915 commit 7727459

File tree

9 files changed

+70
-55
lines changed

9 files changed

+70
-55
lines changed

‎.vent_startup.yml‎

Lines changed: 11 additions & 11 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.11
3+
branch: v0.9.12
44
build: yes
55
start: yes
66
network_tap:
7-
branch: v0.9.11
7+
branch: v0.9.12
88
build: yes
99
start: yes
1010
rabbitmq:
11-
branch: v0.9.11
11+
branch: v0.9.12
1212
build: yes
1313
start: yes
1414
redis:
15-
branch: v0.9.11
15+
branch: v0.9.12
1616
build: yes
1717
start: yes
1818
rq_dashboard:
19-
branch: v0.9.11
19+
branch: v0.9.12
2020
build: yes
2121
start: yes
2222
rq_worker:
23-
branch: v0.9.11
23+
branch: v0.9.12
2424
build: yes
2525
start: yes
2626
settings:
2727
instances: 4
2828
syslog:
29-
branch: v0.9.11
29+
branch: v0.9.12
3030
build: yes
3131
start: yes
3232
https://github.com/cyberreboot/poseidon:
3333
'@':
34-
branch: v0.7.2
34+
branch: v0.7.3
3535
build: yes
3636
start: yes
3737
api:
38-
branch: v0.7.2
38+
branch: v0.7.3
3939
build: yes
4040
start: yes
4141
https://github.com/cyberreboot/vent-plugins:
@@ -50,12 +50,12 @@ https://github.com/cyberreboot/vent-plugins:
5050
build: yes
5151
https://github.com/cyberreboot/crviz:
5252
'@':
53-
branch: v0.3.11
53+
branch: v0.3.12
5454
build: yes
5555
start: yes
5656
https://github.com/cyberreboot/networkml:
5757
'@':
58-
branch: v0.3.8
58+
branch: v0.3.9
5959
build: yes
6060
vent.cfg:
6161
build-options:

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# v0.7.3 (2019-10-03)
2+
3+
- Updated versions of urllib3, pytest, grafana, cmd2, and pylint
4+
- Now uses the auto revert feature of Faucet when using the helper run script
5+
- Endpoints are now a dictionary instead of a list to prevent duplicates
6+
- Fixed an issue where messages from ncapture weren't being handled correctly
7+
- Fixed an issue where the investigations count could be wrong
8+
- Resets the debconf response for collector_nics when not in use
9+
- Debconf option for setting the reinvestigation frequency
10+
- Fixed viz command for Poseidon script
11+
- Handle IP addresses being None
12+
- Better diff of when endpoints change
13+
114
# v0.7.2 (2019-09-17)
215

316
- Added type entries to history

‎Makefile‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,37 +33,37 @@ 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.11
37-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.11
36+
docker pull cyberreboot/vent:v0.9.12
37+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.12
3838

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
39+
docker pull cyberreboot/vent-file-drop:v0.9.12
40+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.9.12
41+
docker pull cyberreboot/vent-network-tap:v0.9.12
42+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.9.12
43+
docker pull cyberreboot/vent-rabbitmq:v0.9.12
44+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.9.12
45+
docker pull cyberreboot/vent-redis:v0.9.12
46+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.9.12
47+
docker pull cyberreboot/vent-rq-dashboard:v0.9.12
48+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.9.12
49+
docker pull cyberreboot/vent-rq-worker:v0.9.12
50+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.9.12
51+
docker pull cyberreboot/vent-syslog:v0.9.12
52+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.9.12
53+
docker pull cyberreboot/poseidon:v0.7.3
54+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.7.3
55+
docker pull cyberreboot/poseidon-api:v0.7.3
56+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.7.3
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
6060
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar cyberreboot/vent-plugins-p0f:v0.1.4
6161
docker pull cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.4
6262
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.4
63-
docker pull cyberreboot/crviz:v0.3.11
64-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-crviz.tar cyberreboot/crviz:v0.3.11
65-
docker pull cyberreboot/networkml:v0.3.8
66-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-networkml.tar cyberreboot/networkml:v0.3.8
63+
docker pull cyberreboot/crviz:v0.3.12
64+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-crviz.tar cyberreboot/crviz:v0.3.12
65+
docker pull cyberreboot/networkml:v0.3.9
66+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-networkml.tar cyberreboot/networkml:v0.3.9
6767

6868
mkdir -p dist
6969
docker build -t poseidon-dpkg -f Dockerfile.dpkg .
@@ -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.11
95-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.11
94+
docker pull cyberreboot/vent:v0.9.12
95+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.12
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.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
155+
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
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.3.dev
1+
0.7.3

‎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.11
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.12
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.3.dev
2+
Version: 0.7.3
33
Section: base
44
Priority: optional
55
Architecture: all

‎installers/debian/postinst‎

Lines changed: 12 additions & 12 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.11
242+
docker pull cyberreboot/vent:v0.9.12
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.11
247+
docker pull cyberreboot/vent-file-drop:v0.9.12
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.11
252+
docker pull cyberreboot/vent-network-tap:v0.9.12
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.11
257+
docker pull cyberreboot/vent-rabbitmq:v0.9.12
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.11
262+
docker pull cyberreboot/vent-redis:v0.9.12
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.11
267+
docker pull cyberreboot/vent-rq-dashboard:v0.9.12
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.11
272+
docker pull cyberreboot/vent-rq-worker:v0.9.12
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.11
277+
docker pull cyberreboot/vent-syslog:v0.9.12
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.2
282+
docker pull cyberreboot/poseidon:v0.7.3
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.2
287+
docker pull cyberreboot/poseidon-api:v0.7.3
288288
else
289289
docker load -i /opt/poseidon/dist/cyberreboot-poseidon-api.tar
290290
fi
@@ -304,12 +304,12 @@ if db_go; then
304304
docker load -i /opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar
305305
fi
306306
if [ ! -f /opt/poseidon/dist/cyberreboot-crviz.tar ]; then
307-
docker pull cyberreboot/crviz:v0.3.11
307+
docker pull cyberreboot/crviz:v0.3.12
308308
else
309309
docker load -i /opt/poseidon/dist/cyberreboot-crviz.tar
310310
fi
311311
if [ ! -f /opt/poseidon/dist/cyberreboot-networkml.tar ]; then
312-
docker pull cyberreboot/networkml:v0.3.8
312+
docker pull cyberreboot/networkml:v0.3.9
313313
else
314314
docker load -i /opt/poseidon/dist/cyberreboot-networkml.tar
315315
fi

‎release/templates/bin_poseidon‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,13 @@ function check_args()
158158
-v|viz|visualize)
159159
if [ "$$(docker ps -q --filter "label=vent.namespace=cyberreboot/crviz" --filter "label=vent.name=" | wc -l)" -eq 1 ]; then
160160
port_map=$$(docker port "$$(docker ps -q --filter "label=vent.namespace=cyberreboot/crviz" --filter "label=vent.name=")" 5000/tcp)
161+
api_port_map=$$(docker port "$$(docker ps -q --filter "label=vent.namespace=cyberreboot/poseidon" --filter "label=vent.name=api")" 8000/tcp)
161162
port=$$(echo "$$port_map" | cut -d':' -f2)
163+
api_port=$$(echo "$$api_port_map" | cut -d':' -f2)
162164
default_iface=$$(awk '$$2 == 00000000 { print $$1 }' /proc/net/route)
163165
default_ip=$$(ip addr show dev "$$default_iface" | awk '$$1 ~ /^inet/ { sub("/.*", "", $$2); print $$2 }' | head -1)
164-
echo "CRviz is connected to Poseidon and accessible here: http://$$default_ip:$$port/"
165-
echo "In the Dataset dropdown, select Poseidon Network."
166+
echo "CRviz is connected to Poseidon and accessible here:"
167+
echo "http://$$default_ip:$$port/?dataSourceName=Poseidon Network&dataSourceUrl=http://$$default_ip:$$api_port/v1/network"
166168
else
167169
echo "CRviz is not running."
168170
fi

0 commit comments

Comments
 (0)