Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								d6b4d96142 
								
							 
						 
						
							
							
								
								update installer for 17.06 branch  
							
							 
							
							
							
						 
						
							2017-10-05 23:22:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								b56ed67dd0 
								
							 
						 
						
							
							
								
								Merge pull request  #134  from dtag-dev-sec/autoupdate  
							
							 
							
							... 
							
							
							
							Add Update Feature 
							
						 
						
							2017-10-06 01:05:59 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								a584d9869e 
								
							 
						 
						
							
							
								
								prepare for merge  
							
							 
							
							... 
							
							
							
							autoupdate is functional as far as the test branch can tell 
							
						 
						
							2017-10-05 22:53:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								9ec38852ae 
								
							 
						 
						
							
							
								
								test 2  
							
							 
							
							
							
						 
						
							2017-10-05 22:46:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								b2ba5f1ea7 
								
							 
						 
						
							
							
								
								test 1  
							
							 
							
							
							
						 
						
							2017-10-05 22:41:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								9ef39d1af6 
								
							 
						 
						
							
							
								
								fix typo  
							
							 
							
							
							
						 
						
							2017-10-05 22:40:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								8159e98e72 
								
							 
						 
						
							
							
								
								tweaking and testing  
							
							 
							
							
							
						 
						
							2017-10-05 22:34:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								4409f9bca0 
								
							 
						 
						
							
							
								
								tweaking and testing  
							
							 
							
							
							
						 
						
							2017-10-05 22:02:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								3f444ef22f 
								
							 
						 
						
							
							
								
								tweaking and testing  
							
							 
							
							
							
						 
						
							2017-10-05 21:02:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								2e7a0fdf4c 
								
							 
						 
						
							
							
								
								tweaking and testing  
							
							 
							
							
							
						 
						
							2017-10-05 19:13:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								dbaccf18f0 
								
							 
						 
						
							
							
								
								start with update script and some testing  
							
							 
							
							
							
						 
						
							2017-09-28 20:00:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								65c7d9cc88 
								
							 
						 
						
							
							
								
								check valid ipv4  
							
							 
							
							
							
						 
						
							2017-09-28 13:30:39 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								e5e8ad4785 
								
							 
						 
						
							
							
								
								fix typo  
							
							 
							
							
							
						 
						
							2017-09-26 17:56:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								7b228c5be0 
								
							 
						 
						
							
							
								
								some cleanup  
							
							 
							
							
							
						 
						
							2017-09-26 15:18:06 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								1347eac88f 
								
							 
						 
						
							
							
								
								update scripts to new file layout  
							
							 
							
							... 
							
							
							
							iso will not include tpot repo
tpot repo will be cloned during install as all the other tools 
							
						 
						
							2017-09-26 15:15:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								b5a4ef948f 
								
							 
						 
						
							
							
								
								play with layout  
							
							 
							
							
							
						 
						
							2017-09-25 21:08:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								65bb8d30b4 
								
							 
						 
						
							
							
								
								Update README.md  
							
							 
							
							
							
						 
						
							2017-09-22 12:18:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									t3chn0m4g3 
								
							 
						 
						
							
							
							
							
								
							
							
								8cb6457882 
								
							 
						 
						
							
							
								
								rename webs to correct name webtty  
							
							 
							
							
							
						 
						
							2017-09-20 15:12:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									t3chn0m4g3 
								
							 
						 
						
							
							
							
							
								
							
							
								ed563f3d90 
								
							 
						 
						
							
							
								
								update readme  
							
							 
							
							
							
						 
						
							2017-09-20 14:02:17 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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