Skip to content

Commit 5b72652

Browse files
cglewiscglewis
authored
Merge pull request #1138 from cglewis/master
release v0.5.7
2 parents 66b2294 + 73ecf8d commit 5b72652

File tree

8 files changed

+66
-55
lines changed

8 files changed

+66
-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.8.1
3+
branch: v0.8.2
44
build: yes
55
start: yes
66
network_tap:
7-
branch: v0.8.1
7+
branch: v0.8.2
88
build: yes
99
start: yes
1010
rabbitmq:
11-
branch: v0.8.1
11+
branch: v0.8.2
1212
build: yes
1313
start: yes
1414
redis:
15-
branch: v0.8.1
15+
branch: v0.8.2
1616
build: yes
1717
start: yes
1818
rq_dashboard:
19-
branch: v0.8.1
19+
branch: v0.8.2
2020
build: yes
2121
start: yes
2222
rq_worker:
23-
branch: v0.8.1
23+
branch: v0.8.2
2424
build: yes
2525
start: yes
2626
settings:
2727
instances: 4
2828
syslog:
29-
branch: v0.8.1
29+
branch: v0.8.2
3030
build: yes
3131
start: yes
3232
https://github.com/cyberreboot/poseidon:
3333
'@':
34-
branch: v0.5.6
34+
branch: v0.5.7
3535
build: yes
3636
start: yes
3737
api:
38-
branch: v0.5.6
38+
branch: v0.5.7
3939
build: yes
4040
start: yes
4141
https://github.com/cyberreboot/vent-plugins:
@@ -54,8 +54,8 @@ https://github.com/cyberreboot/crviz:
5454
build: yes
5555
start: yes
5656
https://github.com/cyberreboot/poseidonml:
57-
onelayer:
58-
branch: v0.2.10
57+
'@':
58+
branch: v0.3.0
5959
build: yes
6060
vent.cfg:
6161
build-options:

‎CHANGELOG.md‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# v0.5.7 (2019-04-04)
2+
3+
- Packaged versions of components, including vent-plugins v0.1.1, poseidonml v0.3.0, crviz v0.2.10, and vent v0.8.2
4+
- New option `poseidon pcap` is now fully operational
5+
- Poseidon can now be run without an SDN controller, useful for using the above pcap feature, or looking at an existing Poseidon database
6+
- Updated version of pika, pytest
7+
- Log level can now we set on any controller mode including Demo
8+
- Suppressed error messages on `poseidon stop`
9+
- Fixed issue where ipv4 and ipv6 addresses from Faucet were getting set to 0
10+
- Fixed issue where ipv6 columns were not showing up when specified in fields in the CLI
11+
112
# v0.5.6 (2019-03-22)
213

314
- Updated version of redis, pika, pyyaml, scp, pytest
@@ -8,7 +19,7 @@
819

920
# v0.5.5 (2019-03-08)
1021

11-
- Packaged versions of components, including vent-plugins v0.1.0, posiedonml v0.2.9, and vent v0.8.0
22+
- Packaged versions of components, including vent-plugins v0.1.0, poseidonml v0.2.9, and vent v0.8.0
1223
- Fixed role bug in CLI
1324
- Added more test coverage to get back up to 90%
1425
- Updated version of pip, pylint
@@ -54,7 +65,7 @@
5465
- Action commands in the CLI now work, including changing state and collecting, via changing to say a mirror state
5566
- Fixed the poseidon shell script to handle if the poseidon-net package was installed
5667
- Updated Docker images to use alpine 3.9
57-
- Fixed a serious bug that cause BCF to no longer work with Poseidon due it not being able to create filters by MAC address
68+
- Fixed a serious bug that caused BCF to no longer work with Poseidon due it not being able to create filters by MAC address
5869

5970
# v0.5.2 (2019-01-25)
6071

‎Makefile‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,24 @@ 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.8.1
37-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.8.1
38-
docker pull cyberreboot/vent-file-drop:v0.8.1
39-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.8.1
40-
docker pull cyberreboot/vent-network-tap:v0.8.1
41-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.8.1
42-
docker pull cyberreboot/vent-rabbitmq:v0.8.1
43-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.8.1
44-
docker pull cyberreboot/vent-redis:v0.8.1
45-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.8.1
46-
docker pull cyberreboot/vent-rq-dashboard:v0.8.1
47-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.8.1
48-
docker pull cyberreboot/vent-rq-worker:v0.8.1
49-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.8.1
50-
docker pull cyberreboot/vent-syslog:v0.8.1
51-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.8.1
52-
docker pull cyberreboot/poseidon-api:v0.5.6
53-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.5.6
36+
docker pull cyberreboot/vent:v0.8.2
37+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.8.2
38+
docker pull cyberreboot/vent-file-drop:v0.8.2
39+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.8.2
40+
docker pull cyberreboot/vent-network-tap:v0.8.2
41+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.8.2
42+
docker pull cyberreboot/vent-rabbitmq:v0.8.2
43+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.8.2
44+
docker pull cyberreboot/vent-redis:v0.8.2
45+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.8.2
46+
docker pull cyberreboot/vent-rq-dashboard:v0.8.2
47+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.8.2
48+
docker pull cyberreboot/vent-rq-worker:v0.8.2
49+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.8.2
50+
docker pull cyberreboot/vent-syslog:v0.8.2
51+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.8.2
52+
docker pull cyberreboot/poseidon-api:v0.5.7
53+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.5.7
5454
docker pull cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.1
5555
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
5656
docker pull cyberreboot/vent-plugins-p0f:v0.1.1
@@ -59,10 +59,10 @@ build_debian:
5959
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.1
6060
docker pull cyberreboot/crviz:v0.2.10
6161
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-crviz.tar cyberreboot/crviz:v0.2.10
62-
docker pull cyberreboot/poseidonml-deviceclassifier-onelayer:v0.2.10
63-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidonml-deviceclassifier-onelayer.tar cyberreboot/poseidonml-deviceclassifier-onelayer:v0.2.10
64-
docker pull cyberreboot/poseidon:v0.5.6
65-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.5.6
62+
docker pull cyberreboot/poseidonml:v0.3.0
63+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidonml.tar cyberreboot/poseidonml:v0.3.0
64+
docker pull cyberreboot/poseidon:v0.5.7
65+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.5.7
6666
mkdir -p dist
6767
docker build -t poseidon-dpkg -f Dockerfile.dpkg .
6868
docker run --rm poseidon-dpkg > dist/$(TAG)-$(VERSION).deb
@@ -89,8 +89,8 @@ build_debian_net:
8989
cp .vent_startup.yml installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
9090
cp -R .git installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
9191
cp -R bin/* installers/debian/$(TAG)-$(VERSION)/usr/bin/
92-
docker pull cyberreboot/vent:v0.8.1
93-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.8.1
92+
docker pull cyberreboot/vent:v0.8.2
93+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.8.2
9494
mkdir -p dist
9595
docker build -t poseidon-dpkg --build-arg PKG_NAME=poseidon-net -f Dockerfile.dpkg .
9696
docker run --rm poseidon-dpkg > dist/$(TAG)-$(VERSION)-net.deb

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ NEW: If you have used the .DEB installer previously, it is worth noting that Pos
145145
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.
146146
```
147147
$ poseidon help
148-
Poseidon 0.5.6, 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
148+
Poseidon 0.5.7, 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
149149
150150
Usage: poseidon [option]
151151
Options:

‎VERSION‎

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

‎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.1
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.2
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.7.dev
2+
Version: 0.5.7
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
@@ -208,47 +208,47 @@ if db_go; then
208208

209209
# load or pull required images
210210
if [ ! -f /opt/poseidon/dist/cyberreboot-vent.tar ]; then
211-
docker pull cyberreboot/vent:v0.8.1
211+
docker pull cyberreboot/vent:v0.8.2
212212
else
213213
docker load -i /opt/poseidon/dist/cyberreboot-vent.tar
214214
fi
215215
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-file-drop.tar ]; then
216-
docker pull cyberreboot/vent-file-drop:v0.8.1
216+
docker pull cyberreboot/vent-file-drop:v0.8.2
217217
else
218218
docker load -i /opt/poseidon/dist/cyberreboot-vent-file-drop.tar
219219
fi
220220
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-network-tap.tar ]; then
221-
docker pull cyberreboot/vent-network-tap:v0.8.1
221+
docker pull cyberreboot/vent-network-tap:v0.8.2
222222
else
223223
docker load -i /opt/poseidon/dist/cyberreboot-vent-network-tap.tar
224224
fi
225225
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar ]; then
226-
docker pull cyberreboot/vent-rabbitmq:v0.8.1
226+
docker pull cyberreboot/vent-rabbitmq:v0.8.2
227227
else
228228
docker load -i /opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar
229229
fi
230230
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-redis.tar ]; then
231-
docker pull cyberreboot/vent-redis:v0.8.1
231+
docker pull cyberreboot/vent-redis:v0.8.2
232232
else
233233
docker load -i /opt/poseidon/dist/cyberreboot-vent-redis.tar
234234
fi
235235
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar ]; then
236-
docker pull cyberreboot/vent-rq-dashboard:v0.8.1
236+
docker pull cyberreboot/vent-rq-dashboard:v0.8.2
237237
else
238238
docker load -i /opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar
239239
fi
240240
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rq-worker.tar ]; then
241-
docker pull cyberreboot/vent-rq-worker:v0.8.1
241+
docker pull cyberreboot/vent-rq-worker:v0.8.2
242242
else
243243
docker load -i /opt/poseidon/dist/cyberreboot-vent-rq-worker.tar
244244
fi
245245
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-syslog.tar ]; then
246-
docker pull cyberreboot/vent-syslog:v0.8.1
246+
docker pull cyberreboot/vent-syslog:v0.8.2
247247
else
248248
docker load -i /opt/poseidon/dist/cyberreboot-vent-syslog.tar
249249
fi
250250
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon-api.tar ]; then
251-
docker pull cyberreboot/poseidon-api:v0.5.6
251+
docker pull cyberreboot/poseidon-api:v0.5.7
252252
else
253253
docker load -i /opt/poseidon/dist/cyberreboot-poseidon-api.tar
254254
fi
@@ -272,13 +272,13 @@ if db_go; then
272272
else
273273
docker load -i /opt/poseidon/dist/cyberreboot-crviz.tar
274274
fi
275-
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidonml-deviceclassifier-onelayer.tar ]; then
276-
docker pull cyberreboot/poseidonml-deviceclassifier-onelayer:v0.2.10
275+
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidonml.tar ]; then
276+
docker pull cyberreboot/poseidonml:v0.3.0
277277
else
278-
docker load -i /opt/poseidon/dist/cyberreboot-poseidonml-deviceclassifier-onelayer.tar
278+
docker load -i /opt/poseidon/dist/cyberreboot-poseidonml.tar
279279
fi
280280
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon.tar ]; then
281-
docker pull cyberreboot/poseidon:v0.5.6
281+
docker pull cyberreboot/poseidon:v0.5.7
282282
else
283283
docker load -i /opt/poseidon/dist/cyberreboot-poseidon.tar
284284
fi
@@ -320,7 +320,7 @@ if db_go; then
320320

321321
command -v python >/dev/null 2>&1 || { echo >&2 -e "${red}Python not installed, please install it first: sudo apt-get install python${endColor}"; db_unregister poseidon/controller_type; exit 1; }
322322
command -v mn >/dev/null 2>&1 || { echo >&2 -e "${red}Mininet not installed, please install it first: sudo apt-get install mininet${endColor}"; db_unregister poseidon/controller_type; exit 1; }
323-
command -v docker-compose >/dev/null 2>&1 || { sudo curl -L https://github.com/docker/compose/releases/download/1.21.2/docker-compose-"$(uname -s)"-"$(uname -m)" -o /usr/local/bin/docker-compose && chmod +x /usr/local/bin/docker-compose; }
323+
command -v docker-compose >/dev/null 2>&1 || { sudo curl -L https://github.com/docker/compose/releases/download/1.24.0/docker-compose-"$(uname -s)"-"$(uname -m)" -o /usr/local/bin/docker-compose && chmod +x /usr/local/bin/docker-compose; }
324324
pushd /tmp; (git clone https://github.com/faucetsdn/faucet || true); popd
325325
pushd /tmp/faucet && FAUCET_CONFIG_STAT_RELOAD=1 FAUCET_EVENT_SOCK=1 FA_RABBIT_HOST=$default_ip docker-compose -f docker-compose.yaml -f adapters/vendors/rabbitmq/docker-compose.yaml up --build -d && popd
326326
cat /opt/poseidon/docs/demo.txt

0 commit comments

Comments
 (0)