Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
a88ddac1
Commit
a88ddac1
authored
Feb 13, 2018
by
Daniel Kłobuszewski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use prometheus-to-sd 0.2.4 and fluentd-gcp-image 2.0.16
parent
430c1a68
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
heapster-controller.yaml
...s/cluster-monitoring/stackdriver/heapster-controller.yaml
+1
-1
event-exporter.yaml
cluster/addons/fluentd-gcp/event-exporter.yaml
+1
-1
fluentd-gcp-ds.yaml
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+5
-5
scaler-deployment.yaml
cluster/addons/fluentd-gcp/scaler-deployment.yaml
+1
-1
metadata-proxy.yaml
cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
+1
-1
No files found.
cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
View file @
a88ddac1
...
@@ -61,7 +61,7 @@ spec:
...
@@ -61,7 +61,7 @@ spec:
-
--sink=stackdriver:?cluster_name={{ cluster_name }}&use_old_resources={{ use_old_resources }}&use_new_resources={{ use_new_resources }}&min_interval_sec=100&batch_export_timeout_sec=110
-
--sink=stackdriver:?cluster_name={{ cluster_name }}&use_old_resources={{ use_old_resources }}&use_new_resources={{ use_new_resources }}&min_interval_sec=100&batch_export_timeout_sec=110
# BEGIN_PROMETHEUS_TO_SD
# BEGIN_PROMETHEUS_TO_SD
-
name
:
prom-to-sd
-
name
:
prom-to-sd
image
:
k8s.gcr.io/prometheus-to-sd:v0.2.
2
image
:
k8s.gcr.io/prometheus-to-sd:v0.2.
4
command
:
command
:
-
/monitor
-
/monitor
-
--source=heapster:http://localhost:8082?whitelisted=stackdriver_requests_count,stackdriver_timeseries_count
-
--source=heapster:http://localhost:8082?whitelisted=stackdriver_requests_count,stackdriver_timeseries_count
...
...
cluster/addons/fluentd-gcp/event-exporter.yaml
View file @
a88ddac1
...
@@ -52,7 +52,7 @@ spec:
...
@@ -52,7 +52,7 @@ spec:
-
'
/event-exporter'
-
'
/event-exporter'
# BEGIN_PROMETHEUS_TO_SD
# BEGIN_PROMETHEUS_TO_SD
-
name
:
prometheus-to-sd-exporter
-
name
:
prometheus-to-sd-exporter
image
:
k8s.gcr.io/prometheus-to-sd:v0.2.
2
image
:
k8s.gcr.io/prometheus-to-sd:v0.2.
4
command
:
command
:
-
/monitor
-
/monitor
-
--stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons
-
--stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons
...
...
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View file @
a88ddac1
apiVersion
:
extensions/v1beta1
apiVersion
:
extensions/v1beta1
kind
:
DaemonSet
kind
:
DaemonSet
metadata
:
metadata
:
name
:
fluentd-gcp-v2.0.1
4
name
:
fluentd-gcp-v2.0.1
6
namespace
:
kube-system
namespace
:
kube-system
labels
:
labels
:
k8s-app
:
fluentd-gcp
k8s-app
:
fluentd-gcp
kubernetes.io/cluster-service
:
"
true"
kubernetes.io/cluster-service
:
"
true"
addonmanager.kubernetes.io/mode
:
Reconcile
addonmanager.kubernetes.io/mode
:
Reconcile
version
:
v2.0.1
4
version
:
v2.0.1
6
spec
:
spec
:
updateStrategy
:
updateStrategy
:
type
:
RollingUpdate
type
:
RollingUpdate
...
@@ -16,7 +16,7 @@ spec:
...
@@ -16,7 +16,7 @@ spec:
labels
:
labels
:
k8s-app
:
fluentd-gcp
k8s-app
:
fluentd-gcp
kubernetes.io/cluster-service
:
"
true"
kubernetes.io/cluster-service
:
"
true"
version
:
v2.0.1
4
version
:
v2.0.1
6
# This annotation ensures that fluentd does not get evicted if the node
# This annotation ensures that fluentd does not get evicted if the node
# supports critical pod annotation based priority scheme.
# supports critical pod annotation based priority scheme.
# Note that this does not guarantee admission on the nodes (#40573).
# Note that this does not guarantee admission on the nodes (#40573).
...
@@ -28,7 +28,7 @@ spec:
...
@@ -28,7 +28,7 @@ spec:
dnsPolicy
:
Default
dnsPolicy
:
Default
containers
:
containers
:
-
name
:
fluentd-gcp
-
name
:
fluentd-gcp
image
:
k8s.gcr.io/fluentd-gcp:2.0.1
4
image
:
k8s.gcr.io/fluentd-gcp:2.0.1
6
env
:
env
:
-
name
:
FLUENTD_ARGS
-
name
:
FLUENTD_ARGS
value
:
--no-supervisor -q
value
:
--no-supervisor -q
...
@@ -77,7 +77,7 @@ spec:
...
@@ -77,7 +77,7 @@ spec:
fi;
fi;
# BEGIN_PROMETHEUS_TO_SD
# BEGIN_PROMETHEUS_TO_SD
-
name
:
prometheus-to-sd-exporter
-
name
:
prometheus-to-sd-exporter
image
:
k8s.gcr.io/prometheus-to-sd:v0.2.
2
image
:
k8s.gcr.io/prometheus-to-sd:v0.2.
4
command
:
command
:
-
/monitor
-
/monitor
-
--stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons
-
--stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons
...
...
cluster/addons/fluentd-gcp/scaler-deployment.yaml
View file @
a88ddac1
...
@@ -22,7 +22,7 @@ spec:
...
@@ -22,7 +22,7 @@ spec:
image
:
gcr.io/google-containers/fluentd-gcp-scaler:0.1
image
:
gcr.io/google-containers/fluentd-gcp-scaler:0.1
command
:
command
:
-
/scaler.sh
-
/scaler.sh
-
--ds-name=fluentd-gcp-v2.0.1
4
-
--ds-name=fluentd-gcp-v2.0.1
6
-
--scaling-policy=fluentd-gcp-scaling-policy
-
--scaling-policy=fluentd-gcp-scaling-policy
env
:
env
:
# Defaults, used if no overrides are found in fluentd-gcp-scaling-policy
# Defaults, used if no overrides are found in fluentd-gcp-scaling-policy
...
...
cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
View file @
a88ddac1
...
@@ -52,7 +52,7 @@ spec:
...
@@ -52,7 +52,7 @@ spec:
cpu
:
"
30m"
cpu
:
"
30m"
# BEGIN_PROMETHEUS_TO_SD
# BEGIN_PROMETHEUS_TO_SD
-
name
:
prometheus-to-sd-exporter
-
name
:
prometheus-to-sd-exporter
image
:
k8s.gcr.io/prometheus-to-sd:v0.2.
2
image
:
k8s.gcr.io/prometheus-to-sd:v0.2.
4
# Request and limit resources to get guaranteed QoS.
# Request and limit resources to get guaranteed QoS.
resources
:
resources
:
requests
:
requests
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment