diff --git a/quickstart/automated-operations.sh b/quickstart/automated-operations.sh index a34dd59..c2d7e81 100755 --- a/quickstart/automated-operations.sh +++ b/quickstart/automated-operations.sh @@ -66,7 +66,7 @@ keptn add-resource --project=$PROJECT --service=$SERVICE --stage=production --re wait_for_deployment_in_namespace "job-executor-service" "keptn" print_headline "Simulate Alert (Problem)" -echo -e "{\"type\": \"sh.keptn.event.production.remediation.triggered\",\"specversion\":\"1.0\",\"source\":\"https:\/\/github.com\/keptn\/keptn\/prometheus-service\",\"id\": \"f2b878d3-03c0-4e8f-bc3f-454bc1b3d79d\", \"time\": \"2019-06-07T07:02:15.64489Z\", \"contenttype\": \"application\/json\", \"data\": {\"project\": \"podtatohead\",\"stage\": \"production\",\"service\": \"helloservice\",\"problem\": { \"problemTitle\": \"out_of_memory\",\"rootCause\": \"Response time degradation\"}}}" > remediation_trigger.json | keptn send event -f remediation_trigger.json +echo -e "{\"type\": \"sh.keptn.event.production.remediation.triggered\",\"specversion\":\"1.0\",\"source\":\"https:\/\/github.com\/keptn-contrib\/prometheus-service\",\"id\": \"f2b878d3-03c0-4e8f-bc3f-454bc1b3d79d\", \"time\": \"2019-06-07T07:02:15.64489Z\", \"contenttype\": \"application\/json\", \"data\": {\"project\": \"podtatohead\",\"stage\": \"production\",\"service\": \"helloservice\",\"problem\": { \"problemTitle\": \"out_of_memory\",\"rootCause\": \"Response time degradation\"}}}" > remediation_trigger.json | keptn send event -f remediation_trigger.json print_headline "Have a look at the Keptn Bridge and explore the demo project" diff --git a/quickstart/demo/jmeter/jmeter.conf.yaml b/quickstart/demo/jmeter/jmeter.conf.yaml index ea477a2..35496e7 100644 --- a/quickstart/demo/jmeter/jmeter.conf.yaml +++ b/quickstart/demo/jmeter/jmeter.conf.yaml @@ -2,8 +2,8 @@ spec_version: '0.1.0' workloads: - teststrategy: performance - vuser: 35 - loopcount: 600 + vuser: 30 + loopcount: 150 script: jmeter/load.jmx acceptederrorrate: 1.0 - teststrategy: performance_light diff --git a/quickstart/demo/prometheus/sli.yaml b/quickstart/demo/prometheus/sli.yaml index e88dcf4..a1e7b79 100644 --- a/quickstart/demo/prometheus/sli.yaml +++ b/quickstart/demo/prometheus/sli.yaml @@ -2,7 +2,7 @@ spec_version: '1.0' indicators: http_response_time_seconds_main_page_sum: sum(rate(http_server_request_duration_seconds_sum{method="GET",route="/",status_code="200",job="$SERVICE-$PROJECT-$STAGE"}[$DURATION_SECONDS])/rate(http_server_request_duration_seconds_count{method="GET",route="/",status_code="200",job="$SERVICE-$PROJECT-$STAGE"}[$DURATION_SECONDS])) - failing_request: promhttp_metric_handler_requests_total{code!="200",job="$SERVICE-$PROJECT-$STAGE"} - http_requests_total_sucess: http_requests_total{status="success"} + failing_request: promhttp_metric_handler_requests_total{code!="200",job="$SERVICE-$PROJECT-$STAGE"}[$DURATION_SECONDS] + http_requests_total_sucess: http_requests_total{status="success",job="$SERVICE-$PROJECT-$STAGE"} go_routines: go_goroutines{job="$SERVICE-$PROJECT-$STAGE"} - request_throughput: sum(rate(http_requests_total{status="success"}[2m])) \ No newline at end of file + request_throughput: sum(rate(http_requests_total{status="success",job="$SERVICE-$PROJECT-$STAGE"}[$DURATION_SECONDS])) diff --git a/quickstart/demo/slo.yaml b/quickstart/demo/slo.yaml index f48db7d..9bf1cec 100644 --- a/quickstart/demo/slo.yaml +++ b/quickstart/demo/slo.yaml @@ -24,7 +24,7 @@ objectives: key_sli: true pass: - criteria: - - "<=90" + - "<=30" - sli: failing_request displayName: "Failing Requests" pass: @@ -32,4 +32,4 @@ objectives: - "< 10" total_score: pass: "90%" - warning: "75%" \ No newline at end of file + warning: "75%" diff --git a/quickstart/multistage-delivery.sh b/quickstart/multistage-delivery.sh index d75c157..0e24e72 100755 --- a/quickstart/multistage-delivery.sh +++ b/quickstart/multistage-delivery.sh @@ -3,9 +3,9 @@ set -e PROJECT="podtatohead" SERVICE="helloservice" -IMAGE="docker.io/jetzlstorfer/helloserver" -VERSION=0.1.1 -SLOW_VERSION=0.1.2 +IMAGE="ghcr.io/podtato-head/podtatoserver" +VERSION=v0.1.1 +SLOW_VERSION=v0.1.2 #source <(curl -s https://raw.githubusercontent.com/keptn/keptn/0.8.5/test/utils.sh) @@ -123,6 +123,8 @@ kubectl create ns monitoring helm repo add prometheus-community https://prometheus-community.github.io/helm-charts helm install prometheus prometheus-community/prometheus --namespace monitoring --wait +verify_test_step $? "Install prometheus failed" + kubectl apply -f - <