Skip to content

jsonnet: Update dependencies #269

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.

Sign up for GitHub

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 1 commit into from
Feb 26, 2019
Merged

jsonnet: Update dependencies #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
232 changes: 205 additions & 27 deletions assets/grafana/dashboard-definitions.yaml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion assets/node-exporter/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,10 @@ spec:
securityContext: {}
serviceAccountName: node-exporter
tolerations:
- effect: NoExecute
operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/master
operator: Exists
volumes:
- hostPath:
path: /proc
Expand Down
2 changes: 1 addition & 1 deletion assets/prometheus-adapter/api-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apiregistration.k8s.io/v1beta1
apiVersion: apiregistration.k8s.io/v1
kind: APIService
metadata:
annotations:
Expand Down
1 change: 0 additions & 1 deletion assets/prometheus-adapter/cluster-role-binding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: prometheus-adapter
namespace: openshift-monitoring
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down
18 changes: 15 additions & 3 deletions assets/prometheus-k8s/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,13 @@ spec:
* on (namespace, pod) group_left(node)
node_namespace_pod:kube_pod_info:)
record: node:node_cpu_utilisation:avg1m
- expr: |
node:node_cpu_utilisation:avg1m
*
node:node_num_cpu:sum
/
scalar(sum(node:node_num_cpu:sum))
record: node:cluster_cpu_utilisation:ratio
- expr: |
sum(node_load1{job="node-exporter"})
/
Expand Down Expand Up @@ -179,8 +186,13 @@ spec:
- expr: |
(node:node_memory_bytes_total:sum - node:node_memory_bytes_available:sum)
/
scalar(sum(node:node_memory_bytes_total:sum))
node:node_memory_bytes_total:sum
record: node:node_memory_utilisation:ratio
- expr: |
(node:node_memory_bytes_total:sum - node:node_memory_bytes_available:sum)
/
scalar(sum(node:node_memory_bytes_total:sum))
record: node:cluster_memory_utilisation:ratio
- expr: |
1e3 * sum(
(rate(node_vmstat_pgpgin{job="node-exporter"}[1m])
Expand Down Expand Up @@ -1014,7 +1026,7 @@ spec:
- alert: etcdHighNumberOfLeaderChanges
annotations:
message: 'etcd cluster "{{ $labels.job }}": instance {{ $labels.instance }}
has seen {{ $value }} leader changes within the last hour.'
has seen {{ $value }} leader changes within the last 30 minutes.'
expr: |
rate(etcd_server_leader_changes_seen_total{job=~".*etcd.*"}[15m]) > 3
for: 15m
Expand Down Expand Up @@ -1067,7 +1079,7 @@ spec:
- alert: etcdHighNumberOfFailedProposals
annotations:
message: 'etcd cluster "{{ $labels.job }}": {{ $value }} proposal failures
within the last hour on etcd instance {{ $labels.instance }}.'
within the last 30 minutes on etcd instance {{ $labels.instance }}.'
expr: |
rate(etcd_server_proposals_failed_total{job=~".*etcd.*"}[15m]) > 5
for: 15m
Expand Down
4 changes: 2 additions & 2 deletions assets/prometheus-operator/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ spec:
- --kubelet-service=kube-system/kubelet
- --logtostderr=true
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.28.0
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.29.0
- --namespaces=openshift-monitoring
image: quay.io/coreos/prometheus-operator:v0.28.0
image: quay.io/coreos/prometheus-operator:v0.29.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pull request also updates the Prometheus Operator. Would you mind adding that to the commit message for future git bisecting? I guess changing the description of the pull request should include it in the merge commit?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it doesn't actually, this is overridden at runtime

name: prometheus-operator
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion assets/telemeter-client/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
data:
match-rules: e19fbmFtZV9fPSJ1cCJ9CntfX25hbWVfXz0iY2x1c3Rlcl92ZXJzaW9uIn0Ke19fbmFtZV9fPSJjbHVzdGVyX29wZXJhdG9yX3VwIn0Ke19fbmFtZV9fPSJjbHVzdGVyX29wZXJhdG9yX2NvbmRpdGlvbnMifQp7X19uYW1lX189ImNsdXN0ZXJfdmVyc2lvbl9wYXlsb2FkIn0Ke19fbmFtZV9fPSJjbHVzdGVyX3ZlcnNpb25fcGF5bG9hZF9lcnJvcnMifQp7X19uYW1lX189Im1hY2hpbmVfY3B1X2NvcmVzIn0Ke19fbmFtZV9fPSJtYWNoaW5lX21lbW9yeV9ieXRlcyJ9CntfX25hbWVfXz0iZXRjZF9vYmplY3RfY291bnRzIn0Ke19fbmFtZV9fPSJBTEVSVFMiLGFsZXJ0c3RhdGU9ImZpcmluZyJ9
match-rules: e19fbmFtZV9fPSJ1cCJ9CntfX25hbWVfXz0iY2x1c3Rlcl92ZXJzaW9uIn0Ke19fbmFtZV9fPSJjbHVzdGVyX3ZlcnNpb25fYXZhaWxhYmxlX3VwZGF0ZXMifQp7X19uYW1lX189ImNsdXN0ZXJfb3BlcmF0b3JfdXAifQp7X19uYW1lX189ImNsdXN0ZXJfb3BlcmF0b3JfY29uZGl0aW9ucyJ9CntfX25hbWVfXz0iY2x1c3Rlcl92ZXJzaW9uX3BheWxvYWQifQp7X19uYW1lX189ImNsdXN0ZXJfdmVyc2lvbl9wYXlsb2FkX2Vycm9ycyJ9CntfX25hbWVfXz0ibWFjaGluZV9jcHVfY29yZXMifQp7X19uYW1lX189Im1hY2hpbmVfbWVtb3J5X2J5dGVzIn0Ke19fbmFtZV9fPSJldGNkX29iamVjdF9jb3VudHMifQp7X19uYW1lX189IkFMRVJUUyIsYWxlcnRzdGF0ZT0iZmlyaW5nIn0=
salt: ""
token: ""
kind: Secret
Expand Down
12 changes: 6 additions & 6 deletions jsonnet/jsonnetfile.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
"version": "7b73aa0466c497955009918eba91f57199131942"
"version": "09e703d238293f1223c9b69f4c56e5127ee233f8"
},
{
"name": "ksonnet",
Expand All @@ -28,7 +28,7 @@
"subdir": ""
}
},
"version": "a16ec1d098eb45e7cfb44d7e4b73ba7b766f0e0a"
"version": "ccb787a44f2ebdecbb346d57490fa7e49981b323"
},
{
"name": "grafonnet",
Expand All @@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
"version": "24590e90dcfc9d581c4208b4bb3d15df50f1328e"
"version": "5d7e5391010c768a6ddd39163c35662f379e20ca"
},
{
"name": "grafana",
Expand All @@ -68,7 +68,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "338addbabc8a29b46840df0bb0355c12b96a6f21"
"version": "7a25bf6b6bb2347dacb235659b73bc210117acc7"
},
{
"name": "etcd-mixin",
Expand All @@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
"version": "1fe6f109c87c4fa47775426a6a60c3b954ed5c33"
"version": "5effa154b464faa6a9ca88296df831eb7f0b8955"
},
{
"name": "telemeter-client",
Expand All @@ -88,7 +88,7 @@
"subdir": "jsonnet/telemeter"
}
},
"version": "89c7292f159fa10e6ccf13a31358e2902f238f41"
"version": "e12aabe48460a1296c416c65cbbd3105339b0cac"
}
]
}
26 changes: 13 additions & 13 deletions pkg/manifests/bindata.go
View file
Open in desktop

Large diffs are not rendered by default.