Merge pull request #12 from k8sstormcenter/fix/makefile-destroy

fix: fix destroy rules in makefile for matcher & neo4j

Author: entlein

Makefile

@@ -1,26 +1,31 @@
 STIX_MODEL_PATH=stix/examples/stix-attack-model.json
 
-all: install-matcher install-neo4j insert-attack-models
-
-install-matcher:
-	kubectl apply -f pattern_matcher/resources.yaml
+all:  install-neo4j install-matcher insert-attack-models
 
 install-neo4j:
 	helm repo add neo4j https://helm.neo4j.com/neo4j
 	helm repo update
 	helm upgrade --install --create-namespace neo4j-poc neo4j/neo4j --namespace neo4j -f neo4j/values.yaml
+	kubectl -n neo4j wait --timeout=10m --for=condition=Ready pod -l app=hub
+
+install-matcher:
+	kubectl apply -f pattern_matcher/resources.yaml
+	kubectl -n redpanda wait --for=condition=Ready pod -l app=matcher
 
 forward-neo4j:
+	kubectl port-forward -n neo4j service/neo4j-poc 7474:7474 &
 	kubectl port-forward -n neo4j service/neo4j-poc 7687:7687
 
 insert-attack-models:
 	POD_NAME=$$(kubectl get pods -n redpanda -l app=matcher -o jsonpath='{.items[0].metadata.name}') ;\
 	kubectl cp ${STIX_MODEL_PATH} redpanda/$${POD_NAME}:/tmp ;\
 	kubectl exec -it -n redpanda $${POD_NAME} -- python /app/src/patternmatcher/load.py /tmp/$(notdir ${STIX_MODEL_PATH})
 
+destroy: destroy-matcher destroy-neo4j
+
 destroy-matcher:
-	kubectl delete pods matcher -n redpanda
+	kubectl delete deployment/matcher -n redpanda
 
 destroy-neo4j:
-	helm uninstall neo4-poc -n neo4j
+	helm uninstall neo4j-poc -n neo4j
 	kubectl delete ns neo4j

README.md

@@ -44,7 +44,12 @@ The [stix](./stix) directory provides examples and resources to help users under
 
 
 ## Getting Started
-Follow these detailed steps to deploy the necessary components on your honey cluster, create your attack model, upload it, and set up monitoring for your specific attack interests:
+Follow these detailed steps to deploy the necessary components on your honey cluster, create your attack model, upload it, and set up monitoring for your specific attack interests.
+
+Step 1-3 can be executed at once using:
+```bash
+make
+```
 
 
 ### Step 1: Deploy the Threat Database
@@ -86,3 +91,11 @@ After setting up your models, you can either simulate an attack on the honey clu
 Once connected, navigate to `localhost:7474` in your web browser to check the database entries and see if the matcher has detected any relevant attacks as defined by your models. With some luck you should be able to see lots of colorful detected balls.
 
 [![Detection](./figures/log-detection.png)](https://drive.google.com/file/d/1RfPr_7RmXDlU22-l7ZFoMnWJKloP0VpG/view?usp=sharing)
+
+
+### Teardown
+Remove all created resources (from step 1-3) on your cluster using
+
+```bash
+make destroy
+```