Merge pull request #2 from NHSDigital/APM-2884-monitor-splunk-ingestion

APM-2884 Fix guid/spec guid

Author: strutt

Makefile

@@ -5,7 +5,6 @@ install-python:
 
 install-node:
 	npm install
-	cd sandbox && npm install
 
 .git/hooks/pre-commit:
 	cp scripts/pre-commit .git/hooks/pre-commit
@@ -45,13 +44,10 @@ _dist_include="pytest.ini poetry.lock poetry.toml pyproject.toml Makefile build/
 release: clean publish build-proxy
 	mkdir -p dist
 	for f in $(_dist_include); do cp -r $$f dist; done
-	cp ecs-proxies-deploy.yml dist/ecs-deploy-sandbox.yml
-	cp ecs-proxies-deploy.yml dist/ecs-deploy-internal-qa-sandbox.yml
-	cp ecs-proxies-deploy.yml dist/ecs-deploy-internal-dev-sandbox.yml
 
 test:
 #	this target should be used for local unit tests ..  runs as part of the build pipeline
-	make --no-print-directory -C sandbox test
+	make --no-print-directory -C test
 
 smoketest:
 #	this target is for end to end smoketests this would be run 'post deploy' to verify an environment is working

azure/azure-pr-pipeline.yml

@@ -36,7 +36,7 @@ extends:
       - environment: internal-dev
         post_deploy:
           - template: ./templates/run-smoke-tests.yml
-      - environment: internal-dev-sandbox
-        proxy_path: sandbox
-        post_deploy:
-          - template: ./templates/run-smoke-tests.yml
+      # - environment: internal-dev-sandbox
+      #   proxy_path: sandbox
+      #   post_deploy:
+      #     - template: ./templates/run-smoke-tests.yml

azure/azure-release-pipeline.yml

@@ -34,18 +34,17 @@ extends:
       - environment: internal-dev
         post_deploy:
           - template: ./templates/run-smoke-tests.yml
-      - environment: internal-qa
-        post_deploy:
-          - template: ./templates/run-smoke-tests.yml
-      - environment: internal-qa-sandbox
-        proxy_path: sandbox
-        post_deploy:
-          - template: ./templates/run-smoke-tests.yml
-    # (App subscription make sense for most sandbox implementations)
-      - environment: sandbox
-        proxy_path: sandbox
-        post_deploy:
-          - template: ./templates/run-smoke-tests.yml
+    #   - environment: internal-qa
+    #     post_deploy:
+    #       - template: ./templates/run-smoke-tests.yml
+    #   - environment: internal-qa-sandbox
+    #     proxy_path: sandbox
+    #     post_deploy:
+    #       - template: ./templates/run-smoke-tests.yml
+    #   - environment: sandbox
+    #     proxy_path: sandbox
+    #     post_deploy:
+    #       - template: ./templates/run-smoke-tests.yml
     # Enable int environment when ready by uncommenting:
     #   - environment: int
     #     depends_on:

ecs-proxies-containers.yml

@@ -4,26 +4,26 @@ DESCRIPTION: example description
 APIGEE_ENVIRONMENTS:
   - name: internal-dev
     display_name: Internal Development
-  - name: internal-dev-sandbox
-    display_name: Internal Development Sandbox
-  - name: internal-qa
-    display_name: Internal QA
-  - name: internal-qa-sandbox
-    display_name: Internal QA Sandbox
-  - name: ref
-    display_name: Reference
-  - name: sandbox
-    display_name: Sandbox
+  # - name: internal-dev-sandbox
+  #   display_name: Internal Development Sandbox
+  # - name: internal-qa
+  #   display_name: Internal QA
+  # - name: internal-qa-sandbox
+  #   display_name: Internal QA Sandbox
+  # - name: ref
+  #   display_name: Reference
+  # - name: sandbox
+  #   display_name: Sandbox
 # Enable int environment when ready by uncommenting:
 #   - name: int
 #     display_name: Integration Testing
 ---
 meta:
   api:
     name: splunk-monitor
-    guid: 8ba4eaff-2f75-4358-bebf-94737513f287
+    guid: ade44d06-0c60-40b6-8728-ca306e4ee504
     spec_guids:
-      - 474f2500-6a30-4cd0-a935-55497c094306
+      - ec9372e3-7c8e-4b43-a17d-807b7462fbc2
   schema_version: 1.3
 apigee:
   environments: