Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								928c55af6b 
								
							 
						 
						
							
							
								
								Update README.md  
							
							 
							
							
							
						 
						
							2017-09-19 09:29:08 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								38beb25e76 
								
							 
						 
						
							
							
								
								update licenses  
							
							 
							
							
							
						 
						
							2017-09-19 09:26:41 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								cf7b1c3e5d 
								
							 
						 
						
							
							
								
								update some license information  
							
							 
							
							
							
						 
						
							2017-09-19 09:09:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								972e5f5085 
								
							 
						 
						
							
							
								
								continue working on readme  
							
							 
							
							
							
						 
						
							2017-09-18 23:01:34 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								0c8ea5576f 
								
							 
						 
						
							
							
								
								update screenshots  
							
							 
							
							
							
						 
						
							2017-09-18 22:36:27 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								a137e09dc6 
								
							 
						 
						
							
							
								
								17.10 dashboard  
							
							 
							
							
							
						 
						
							2017-09-18 22:23:44 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								e3b112322a 
								
							 
						 
						
							
							
								
								start working on updated readme  
							
							 
							
							
							
						 
						
							2017-09-06 17:51:18 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								767943d5ce 
								
							 
						 
						
							
							
								
								update architecture  
							
							 
							
							
							
						 
						
							2017-09-06 15:14:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								cca4c3602b 
								
							 
						 
						
							
							
								
								update links  
							
							 
							
							
							
						 
						
							2017-09-02 21:37:56 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								0363b218ec 
								
							 
						 
						
							
							
								
								update logo  
							
							 
							
							
							
						 
						
							2017-08-30 15:12:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								ba56a6c923 
								
							 
						 
						
							
							
								
								fix install error regarding blanks in hostname  
							
							 
							
							
							
						 
						
							2017-08-30 11:20:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								0a3b67e01c 
								
							 
						 
						
							
							
								
								tweaking, t-pot docker tags to 1710  
							
							 
							
							
							
						 
						
							2017-08-28 20:03:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								3ee9ad15d7 
								
							 
						 
						
							
							
								
								add mailoney, rdpy dashboards  
							
							 
							
							
							
						 
						
							2017-08-27 20:40:55 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								56ebd9f05c 
								
							 
						 
						
							
							
								
								include rdpy honeypot  
							
							 
							
							
							
						 
						
							2017-08-27 00:37:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								46eea25f38 
								
							 
						 
						
							
							
								
								bump ctop version to 0.6.1  
							
							 
							
							
							
						 
						
							2017-08-24 22:43:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								fc52474fa0 
								
							 
						 
						
							
							
								
								add glastopf.db to logrotate.conf  
							
							 
							
							
							
						 
						
							2017-08-23 10:02:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								6ff5c6b94f 
								
							 
						 
						
							
							
								
								all dashboards are now adapted to 17.x  
							
							 
							
							... 
							
							
							
							will probably still need some finetuning 
							
						 
						
							2017-08-20 21:12:46 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								6d98aaf1bd 
								
							 
						 
						
							
							
								
								tweaking, account for new elk versions  
							
							 
							
							
							
						 
						
							2017-08-18 22:54:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								277f24e0ee 
								
							 
						 
						
							
							
								
								prepare for vnclowpot tweaking  
							
							 
							
							
							
						 
						
							2017-08-18 22:05:30 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								26f019c894 
								
							 
						 
						
							
							
								
								prepare for vnclowpot and more dashboards finished  
							
							 
							
							
							
						 
						
							2017-08-18 22:02:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								93e6ce9712 
								
							 
						 
						
							
							
								
								re-eanble ipv6 for docker  
							
							 
							
							
							
						 
						
							2017-08-14 22:40:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								53f11c419c 
								
							 
						 
						
							
							
								
								dashboards tweaking  
							
							 
							
							
							
						 
						
							2017-08-14 16:32:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								796e74059e 
								
							 
						 
						
							
							
								
								clean up  
							
							 
							
							
							
						 
						
							2017-08-14 15:10:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								d1c167bd5f 
								
							 
						 
						
							
							
								
								tweaking  
							
							 
							
							... 
							
							
							
							allow for ftp data
forward ftp data into dionaea container
disable ipv6 since it messes up dionaea ip logging 
							
						 
						
							2017-08-14 14:55:28 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								adc8ddd090 
								
							 
						 
						
							
							
								
								tweaking  
							
							 
							
							... 
							
							
							
							Update backup_es_folders to fit latest 17.x design
Include updated elkbase
Include updated kibana-objects 
							
						 
						
							2017-08-11 20:27:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								9e2313d7ca 
								
							 
						 
						
							
							
								
								fix visual bug (sometimes only string PORTS is displayed)  
							
							 
							
							
							
						 
						
							2017-08-07 14:54:33 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								8e8f94b1b4 
								
							 
						 
						
							
							
								
								fix curator  
							
							 
							
							... 
							
							
							
							-the old curator does not support ES 5.x
-include curator 5.1.1 and pin version to exactly that to avoid surprises with disruptive updates
-configs reside in /etc/tpot/curator
-will be started daily through /etc/crontab
-by default all logstash indices older than 90 days will be deleted 
							
						 
						
							2017-08-07 13:18:55 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								b25caf6302 
								
							 
						 
						
							
							
								
								improve dps.sh output  
							
							 
							
							
							
						 
						
							2017-08-07 10:24:25 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								36bb76d999 
								
							 
						 
						
							
							
								
								add dep for listbot (prips)  
							
							 
							
							
							
						 
						
							2017-07-23 22:56:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								77a4635f59 
								
							 
						 
						
							
							
								
								maltrail is too far off scope  
							
							 
							
							
							
						 
						
							2017-07-23 10:25:40 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								01d4ef2928 
								
							 
						 
						
							
							
								
								account for unresolved external ip address  
							
							 
							
							
							
						 
						
							2017-07-21 15:26:37 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								07c3f48894 
								
							 
						 
						
							
							
								
								compress and rotate logs if persistence enabled  
							
							 
							
							... 
							
							
							
							if persistence is enabled, log files, downloads, binaries, etc. will be compressed and rotated
each start / stop of the t-pot service will account for a full rotation cycle if files are not empty
basically the rotation will recycle logs after 30 days, unless the service is stopped / started manually which will cause for a shorter period 
							
						 
						
							2017-07-20 20:25:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								0dedd4a172 
								
							 
						 
						
							
							
								
								add unzip as dep for ip rep downloader  
							
							 
							
							
							
						 
						
							2017-07-13 17:24:13 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								c8c3124f04 
								
							 
						 
						
							
							
								
								tweaking  
							
							 
							
							
							
						 
						
							2017-07-12 18:53:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								022a48f1b8 
								
							 
						 
						
							
							
								
								tweaking  
							
							 
							
							
							
						 
						
							2017-07-12 18:51:20 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								9e880d14ed 
								
							 
						 
						
							
							
								
								test backport fix for hostname  
							
							 
							
							
							
						 
						
							2017-06-29 08:04:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								6549f8f582 
								
							 
						 
						
							
							
								
								nsa gen is no more, offline alternative  
							
							 
							
							
							
						 
						
							2017-06-21 22:46:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								51e8dc1aca 
								
							 
						 
						
							
							
								
								fix path  
							
							 
							
							
							
						 
						
							2017-06-21 19:34:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								0e7563da17 
								
							 
						 
						
							
							
								
								prepare for honeypot changes  
							
							 
							
							
							
						 
						
							2017-06-21 19:26:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								77e68f0e64 
								
							 
						 
						
							
							
								
								tweaking, add new honeypot  
							
							 
							
							... 
							
							
							
							correct a typo in CONTRIBUTING.MD
preapre for and add mailoney honeypot 
							
						 
						
							2017-06-15 22:08:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								a1bc127698 
								
							 
						 
						
							
							
								
								consider commented config lines  
							
							 
							
							
							
						 
						
							2017-06-07 16:24:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								66cdb0e60a 
								
							 
						 
						
							
							
								
								modifications for conpot update  
							
							 
							
							
							
						 
						
							2017-06-07 15:51:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								4e6f4fc9e8 
								
							 
						 
						
							
							
								
								finetuning  
							
							 
							
							... 
							
							
							
							add p0f
change some defaults 
							
						 
						
							2017-06-06 22:32:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								48d36f999d 
								
							 
						 
						
							
							
								
								finetuning suricata  
							
							 
							
							
							
						 
						
							2017-06-03 23:56:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								aea18d5f92 
								
							 
						 
						
							
							
								
								squashing some bugs  
							
							 
							
							... 
							
							
							
							do not forward tcp connections to or from 127.0.0.1 to NFQ (fixes strange netdata behaviour)
run netdata on network mode host again (update compose files) including host metrics 
							
						 
						
							2017-05-30 19:07:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								5d8ad0a623 
								
							 
						 
						
							
							
								
								add spiderfoot persistence  
							
							 
							
							
							
						 
						
							2017-05-25 21:59:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								2bbafbc791 
								
							 
						 
						
							
							
								
								handle iptables differently  
							
							 
							
							
							
						 
						
							2017-05-23 23:32:07 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								345df08941 
								
							 
						 
						
							
							
								
								improvements  
							
							 
							
							... 
							
							
							
							use docker-compose from pypi with support for 2.1 compose file version
logstash, kibana, head & netdata are now depending on a healthy elasticsearch container before starting
remove alerta-cli
tweak installer 
							
						 
						
							2017-05-22 19:36:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								931ac2dd85 
								
							 
						 
						
							
							
								
								tweaking  
							
							 
							
							... 
							
							
							
							update dps.sh
adjust docker-compose related tpot configs for dionaea (stdin_open: true)
adjust tpot.service (suritcata / p0f prep) to be aware of a situation without local network route ( Fixes#99 ) 
							
						 
						
							2017-05-11 17:01:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								ce0e42e555 
								
							 
						 
						
							
							
								
								get latest ctop  
							
							 
							
							
							
						 
						
							2017-05-04 22:52:32 +00:00