Skip to content

Networking metrics #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 85 commits into from
Aug 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
0e8fc14
operator endpoint in istio
1vn Jul 11, 2019
a1d2c4d
progress
1vn Jul 12, 2019
556dfb0
WORKING
1vn Jul 17, 2019
d5d16e7
fix namespace
1vn Jul 17, 2019
a3fe16c
cleanup
1vn Jul 17, 2019
b872e18
Replace argo with operator DAG manager
deliahu Jul 17, 2019
9051110
Merge branch 'master' of github.com:cortexlabs/cortex into dag
deliahu Jul 17, 2019
928675a
Rename pod check intervals
deliahu Jul 17, 2019
4d95415
Update operator_local
deliahu Jul 17, 2019
1c01b3a
Skip external dataset check if no environment
deliahu Jul 17, 2019
05e43cb
Cap desired replicas at max replicas
deliahu Jul 18, 2019
e960602
merge dag
1vn Jul 18, 2019
edf1816
Update api workload succeeded check
deliahu Jul 18, 2019
76a325f
Use Update() instead of Patch() in k8s
deliahu Jul 18, 2019
e265d88
Remove killdev make command
deliahu Jul 18, 2019
8981de2
fix api
1vn Jul 18, 2019
3a2b6d7
merge dag
1vn Jul 18, 2019
9807aa2
minor fixes
1vn Jul 18, 2019
6f455ef
progress
1vn Jul 19, 2019
55884bc
https progress
1vn Jul 22, 2019
67f6050
merge master
1vn Jul 22, 2019
f6da3fc
https
1vn Jul 23, 2019
4b99f50
generate random password
1vn Jul 24, 2019
23c3f5a
remove istio READMEs and examples
1vn Jul 24, 2019
3585277
clean up
1vn Jul 24, 2019
3787854
format
1vn Jul 24, 2019
f01b6ff
merge master
1vn Jul 24, 2019
d3a6e04
update lint
1vn Jul 24, 2019
6b12db7
remove vendoring of istio, download at build time
1vn Jul 24, 2019
6f5cc35
add back space
1vn Jul 24, 2019
3835a8c
add back eks commands
1vn Jul 24, 2019
240d8a8
remove helm uninstall lines
1vn Jul 24, 2019
175e775
clean up
1vn Jul 25, 2019
6487bdc
clean up
1vn Jul 25, 2019
ee96c71
clean up
1vn Jul 26, 2019
b84d1e9
address comments
1vn Jul 26, 2019
1e3638e
merge master
1vn Jul 26, 2019
9381501
unexport update
1vn Jul 26, 2019
66fc3c0
unexport update
1vn Jul 26, 2019
9dd8cb5
remove ls, add back uninstall
1vn Jul 26, 2019
198ce5d
progress
1vn Jul 26, 2019
3fae4e1
merge master
1vn Jul 26, 2019
265a4f4
address comments
1vn Jul 26, 2019
6c9a0e3
remove newlines
1vn Jul 26, 2019
2fe7980
fix api port
1vn Jul 26, 2019
66121f7
address comments
1vn Jul 26, 2019
fbce830
merge master
1vn Jul 26, 2019
1fe657a
clean up install/uninstall
1vn Jul 27, 2019
a4e9d17
add license
1vn Jul 27, 2019
a9ac5b7
Merge branch 'master' into istio
1vn Jul 29, 2019
f74b71b
add missing istio images
1vn Jul 30, 2019
f45fac2
add to cortex
1vn Jul 30, 2019
d6395b4
wait for istio propagation
1vn Jul 30, 2019
403845f
progress
1vn Jul 30, 2019
08c0847
progress
1vn Jul 31, 2019
16430b4
progress
1vn Jul 31, 2019
e02c218
progress
1vn Jul 31, 2019
c032b73
merge master
1vn Jul 31, 2019
54dbc5b
merge master
1vn Jul 31, 2019
03c26da
remove
1vn Aug 1, 2019
33f75b0
track requests
1vn Aug 2, 2019
4a40457
track response time
1vn Aug 2, 2019
3c78f63
Merge branch 'master' into istio-metrics
1vn Aug 2, 2019
76519d1
report errors
1vn Aug 2, 2019
6d3cd3d
merge master
1vn Aug 2, 2019
2caa12c
lint
1vn Aug 2, 2019
fd9dfde
remove error
1vn Aug 2, 2019
74a97aa
undo leftover changes
1vn Aug 5, 2019
38076f0
Merge branch 'master' into istio-metrics
1vn Aug 5, 2019
091c014
remove dev/cortex.sh
1vn Aug 5, 2019
c7f4802
remove json indirect dep
1vn Aug 5, 2019
8b981a7
track requests
1vn Aug 5, 2019
35b1258
fix ordering
1vn Aug 5, 2019
7a03909
clean up metrics
1vn Aug 5, 2019
770a11f
remove api ID
1vn Aug 5, 2019
c7ad6a6
remove workloadType
1vn Aug 5, 2019
a779900
record response time from ingress
1vn Aug 5, 2019
60cf44c
remove istio.yaml
1vn Aug 5, 2019
3c71bbb
clean up
1vn Aug 5, 2019
0189836
address comments and fix secrets bug
1vn Aug 6, 2019
2c09681
merge master
1vn Aug 6, 2019
851c82f
address comments
1vn Aug 7, 2019
61c3622
nulls -> null
1vn Aug 7, 2019
2dcde25
Merge branch 'master' into istio-metrics
1vn Aug 7, 2019
b740439
merge master
1vn Aug 7, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions manager/install_cortex.sh
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,19 @@ function setup_istio() {
echo -n "."
sleep 5
done

echo -n "."
envsubst < manifests/istio.yaml | helm template istio-manifests/istio --values - --name istio --namespace istio-system | kubectl apply -f - >/dev/null
helm template istio-manifests/istio-cni --name istio-cni --namespace kube-system | kubectl apply -f - >/dev/null
envsubst < manifests/istio-values.yaml | helm template istio-manifests/istio --values - --name istio --namespace istio-system | kubectl apply -f - >/dev/null
envsubst < manifests/istio-metrics.yaml | kubectl apply -f - >/dev/null
kubectl -n=istio-system create secret generic 'aws-credentials' \
--from-literal='AWS_ACCESS_KEY_ID'=$AWS_ACCESS_KEY_ID \
--from-literal='AWS_SECRET_ACCESS_KEY'=$AWS_SECRET_ACCESS_KEY \
-o yaml --dry-run | kubectl apply -f - >/dev/null
istio_patch="[
{\"op\": \"add\", \"path\": \"/spec/template/spec/containers/0/env/-\", \"value\": {\"name\": \"AWS_ACCESS_KEY_ID\", \"valueFrom\": {\"secretKeyRef\": {\"name\": \"aws-credentials\", \"key\": \"AWS_ACCESS_KEY_ID\"}}}},\
{\"op\": \"add\", \"path\": \"/spec/template/spec/containers/0/env/-\", \"value\": {\"name\": \"AWS_SECRET_ACCESS_KEY\", \"valueFrom\": {\"secretKeyRef\": {\"name\": \"aws-credentials\", \"key\": \"AWS_SECRET_ACCESS_KEY\"}}}},\
]"
kubectl patch deployment istio-telemetry -n istio-system --type='json' -p="$istio_patch"
}

function validate_cortex() {
Expand Down
54 changes: 54 additions & 0 deletions manager/manifests/istio-metrics.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# Copyright 2019 Cortex Labs, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

apiVersion: config.istio.io/v1alpha2
kind: instance
metadata:
name: response-time
namespace: $CORTEX_NAMESPACE
spec:
compiledTemplate: metric
params:
value: response.duration
dimensions:
REQUEST_PATH: request.url_path | "unknown"
---
apiVersion: config.istio.io/v1alpha2
kind: handler
metadata:
name: cortex-request-handler
namespace: $CORTEX_NAMESPACE
spec:
compiledAdapter: cloudwatch
params:
namespace: $CORTEX_NAMESPACE
logGroupName: $CORTEX_LOG_GROUP
logStreamName: $CORTEX_LOG_GROUP
metricInfo:
response-time.instance.cortex:
unit: Milliseconds
logs: {}
---
apiVersion: config.istio.io/v1alpha2
kind: rule
metadata:
name: cortex-api-requests
namespace: $CORTEX_NAMESPACE
spec:
match: source.workload.name == "apis-ingressgateway"
actions:
- handler: cortex-request-handler
instances:
- response-time
---
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ mixer:

telemetry:
enabled: true
env:
AWS_REGION: $CORTEX_REGION
LOG_GROUP_NAME: $CORTEX_LOG_GROUP

pilot:
image: $CORTEX_IMAGE_ISTIO_PILOT
Expand Down