Skip to content
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

Jump to bottom

jsonnet/jsonnetfile.lock.json: Update dependencies #593

Merged
merged 6 commits into from Dec 19, 2019
Merged

jsonnet/jsonnetfile.lock.json: Update dependencies #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5fc8977
jsonnet/jsonnetfile.lock.json: Update deps
lilic Dec 18, 2019
86490b6
assets,pkg: Regenerate manifests
lilic Dec 18, 2019
5b34fdb
jsonnet/rules.jsonnet: Change apiserver_request_count to apiserver_re…
lilic Dec 18, 2019
7a08236
assets,pkg: Regenerate manifests
lilic Dec 18, 2019
1dab739
jsonnetfile.lock.json: Bump deps
lilic Dec 19, 2019
8159ae1
assets,pkg: Regenerate files
lilic Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions assets/grafana/dashboard-definitions.yaml
View file
Open in desktop
Expand Up @@ -64,6 +64,7 @@ items:
"threshold": 0
},
"datasource": "$datasource",
"description": "",
"fontSize": "80%",
"format": "Bps",
"gridPos": {
Expand Down Expand Up @@ -109,6 +110,7 @@ items:
"threshold": 0
},
"datasource": "$datasource",
"description": "",
"fontSize": "80%",
"format": "Bps",
"gridPos": {
Expand Down Expand Up @@ -492,6 +494,7 @@ items:
"threshold": 0
},
"datasource": "$datasource",
"description": "",
"fontSize": "80%",
"format": "Bps",
"gridPos": {
Expand Down Expand Up @@ -537,6 +540,7 @@ items:
"threshold": 0
},
"datasource": "$datasource",
"description": "",
"fontSize": "80%",
"format": "Bps",
"gridPos": {
Expand Down
6 changes: 3 additions & 3 deletions assets/prometheus-k8s/rules.yaml
View file
Open in desktop
Expand Up @@ -404,9 +404,9 @@ spec:
record: build_error_rate
- name: openshift-sre.rules
rules:
- expr: sum(rate(apiserver_request_count{job="apiserver"}[10m])) BY (code)
record: code:apiserver_request_count:rate:sum
- expr: sum(rate(apiserver_request_count{job="apiserver",resource=~"image.*",verb!="WATCH"}[10m]))
- expr: sum(rate(apiserver_request_total{job="apiserver"}[10m])) BY (code)
record: code:apiserver_request_total:rate:sum
- expr: sum(rate(apiserver_request_total{job="apiserver",resource=~"image.*",verb!="WATCH"}[10m]))
BY (code)
record: code:registry_api_request_count:rate:sum
- expr: sum(kube_pod_status_ready{condition="true",namespace="openshift-etcd",pod=~"etcd.*"})
Expand Down
32 changes: 32 additions & 0 deletions assets/prometheus-k8s/service-monitor-kubelet.yaml
View file
Open in desktop
Expand Up @@ -23,6 +23,38 @@ spec:
honorLabels: true
interval: 30s
metricRelabelings:
- action: drop
regex: kubelet_(pod_worker_latency_microseconds|pod_start_latency_microseconds|cgroup_manager_latency_microseconds|pod_worker_start_latency_microseconds|pleg_relist_latency_microseconds|pleg_relist_interval_microseconds|runtime_operations|runtime_operations_latency_microseconds|runtime_operations_errors|eviction_stats_age_microseconds|device_plugin_registration_count|device_plugin_alloc_latency_microseconds|network_plugin_operations_latency_microseconds)
sourceLabels:
- __name__
- action: drop
regex: scheduler_(e2e_scheduling_latency_microseconds|scheduling_algorithm_predicate_evaluation|scheduling_algorithm_priority_evaluation|scheduling_algorithm_preemption_evaluation|scheduling_algorithm_latency_microseconds|binding_latency_microseconds|scheduling_latency_seconds)
sourceLabels:
- __name__
- action: drop
regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs)
sourceLabels:
- __name__
- action: drop
regex: docker_(operations|operations_latency_microseconds|operations_errors|operations_timeout)
sourceLabels:
- __name__
- action: drop
regex: reflector_(items_per_list|items_per_watch|list_duration_seconds|lists_total|short_watches_total|watch_duration_seconds|watches_total)
sourceLabels:
- __name__
- action: drop
regex: etcd_(helper_cache_hit_count|helper_cache_miss_count|helper_cache_entry_count|request_cache_get_latencies_summary|request_cache_add_latencies_summary|request_latencies_summary)
sourceLabels:
- __name__
- action: drop
regex: transformation_(transformation_latencies_microseconds|failures_total)
sourceLabels:
- __name__
- action: drop
regex: kubeproxy_sync_proxy_rules_latency_microseconds|rest_client_request_latency_secons
sourceLabels:
- __name__
- action: drop
regex: container_(network_tcp_usage_total|network_udp_usage_total|tasks_state|cpu_load_average_10s)
sourceLabels:
Expand Down
24 changes: 12 additions & 12 deletions jsonnet/jsonnetfile.lock.json
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
"version": "fb7703ab430ca2f23cd2f70bad8d1d38f9b165fb",
"version": "5770a6d286fe48682e29b54ce0df37e7d24b3280",
"sum": "Ko3qhNfC2vN/houLh6C0Ryacjv70gl0DVPGU/PQ4OD0="
},
{
Expand All @@ -30,7 +30,7 @@
"subdir": "grafana-builder"
}
},
"version": "8813f9108550cd510b17ce5a8bac9261dd140e13",
"version": "676ff4b4fe9135f85a5d6e30523d64d2d3713087",
"sum": "ELsYwK+kGdzX1mee2Yy+/b2mdO4Y503BOCDkFzwmGbE="
},
{
Expand All @@ -41,8 +41,8 @@
"subdir": "grafonnet"
}
},
"version": "22420e64b58913754871a1c7d6c7b3cfd3651460",
"sum": "z/+CW6854tMTaI4+iRbx0nwP/m/vzf5LezBfZVXZKqU="
"version": "f3ee1d810858cf556d25f045b53cb0f1fd10b94e",
"sum": "14YBZUP/cl8qi9u86xiuUS4eXQrEAam+4GSg6i9n9Ys="
},
{
"name": "ksonnet",
Expand All @@ -63,8 +63,8 @@
"subdir": "jsonnet/kube-prometheus"
}
},
"version": "543ccec9704fa447a293e362f678b38c444af0ea",
"sum": "hKEvpLPDSlFY30qXhdspyIIDAZhBy7vOfeTY1LCmUOU="
"version": "9211c42df0c33b1daa85c7fc709dd2a9a398a240",
"sum": "XNEiGhywewqef1IF0JrlMlO4CuZerNeylXiLkHsaKEk="
},
{
"name": "kube-thanos",
Expand All @@ -74,8 +74,8 @@
"subdir": "jsonnet/kube-thanos"
}
},
"version": "9bd3133ee1b2e6e5da446d94704ed33562a31b33",
"sum": "1cyDaR05OAJ76DRFyDeQdFOUJlNGgmGvhBc7+YeF4AQ="
"version": "252fcaa56b267ed756ea59ecaf5fcc44f2cd287b",
"sum": "mkbF2iBDt0qyQ6eJC3+Q7Ss6H1gr9QAOmnTtK3MIvbw="
},
{
"name": "kubernetes-mixin",
Expand Down Expand Up @@ -118,7 +118,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
"version": "fce2e131dba3d4150e1b44b7b2d1a5e62f655dc7",
"version": "34e0376ef89e31adc58282ba1e8421a0fdb39a9e",
"sum": "/cohvDTaIiLElG66tKeQsi4v1M9mlGDKjOBSWivL9TU="
},
{
Expand All @@ -129,7 +129,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "d6d17e6b9653374d7c8e8829b065da9ea3b69aa6",
"version": "b69e4b73fecbdf24be888605d91d9d19ec23d095",
"sum": "N9LzLlpaBNxMLSFVt3AHI/nCDWI6bSM63GS+0Ur+Qh0="
},
{
Expand Down Expand Up @@ -162,8 +162,8 @@
"subdir": "jsonnet/telemeter"
}
},
"version": "94a9ee6a847d21d8a197480159ebc905071d28e6",
"sum": "8j1KQklcMnp3ElsHvS7OjVeZNMUJLE2XU0CVyHeOycc="
"version": "04e896229a25482642a38937d9ff452302710ac6",
"sum": "s62onQakVZ2xrTyahP9G3gVMu+ovTG9STA8PukCJy3U="
}
]
}
12 changes: 6 additions & 6 deletions jsonnet/rules.jsonnet
View file
Open in desktop
Expand Up @@ -96,7 +96,7 @@
), 1
)
|||,
record: 'cluster:cpu_core_hyperthreading'
record: 'cluster:cpu_core_hyperthreading',
},
{
expr: |||
Expand All @@ -105,7 +105,7 @@
label_node_role_kubernetes_io_master, label_node_role_kubernetes_io_infra)
label_replace( cluster:cpu_core_hyperthreading, "node", "$1", "instance", "(.*)" )
|||,
record: 'cluster:cpu_core_node_labels'
record: 'cluster:cpu_core_node_labels',
},
{
expr: 'count(cluster:cpu_core_node_labels) by (label_beta_kubernetes_io_instance_type, label_node_hyperthread_enabled)',
Expand Down Expand Up @@ -206,7 +206,7 @@
{
expr: 'sum by (frontend) (haproxy_frontend_current_sessions)',
record: 'frontend:cluster:ingress_frontend_connections:sum',
}
},
],
},
{
Expand All @@ -222,11 +222,11 @@
name: 'openshift-sre.rules',
rules: [
{
expr: 'sum(rate(apiserver_request_count{job="apiserver"}[10m])) BY (code)',
record: 'code:apiserver_request_count:rate:sum',
expr: 'sum(rate(apiserver_request_total{job="apiserver"}[10m])) BY (code)',
record: 'code:apiserver_request_total:rate:sum',
},
{
expr: 'sum(rate(apiserver_request_count{job="apiserver",resource=~"image.*",verb!="WATCH"}[10m])) BY (code)',
expr: 'sum(rate(apiserver_request_total{job="apiserver",resource=~"image.*",verb!="WATCH"}[10m])) BY (code)',
record: 'code:registry_api_request_count:rate:sum',
},
{
Expand Down
10 changes: 5 additions & 5 deletions pkg/manifests/bindata.go
View file
Open in desktop

Large diffs are not rendered by default.