aboutsummaryrefslogtreecommitdiffstats
path: root/vnfs/DAaaS
diff options
context:
space:
mode:
Diffstat (limited to 'vnfs/DAaaS')
-rw-r--r--vnfs/DAaaS/collection/charts/cadvisor/.helmignore22
-rw-r--r--vnfs/DAaaS/collection/charts/cadvisor/Chart.yaml19
-rw-r--r--vnfs/DAaaS/collection/charts/cadvisor/templates/NOTES.txt34
-rw-r--r--vnfs/DAaaS/collection/charts/cadvisor/templates/_helpers.tpl25
-rw-r--r--vnfs/DAaaS/collection/charts/cadvisor/templates/daemonset.yaml77
-rw-r--r--vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml34
-rw-r--r--vnfs/DAaaS/collection/charts/cadvisor/values.yaml23
-rw-r--r--vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt35
-rw-r--r--vnfs/DAaaS/collection/charts/collectd/templates/service.yaml2
-rw-r--r--vnfs/DAaaS/collection/charts/collectd/values.yaml4
-rw-r--r--vnfs/DAaaS/collection/charts/prometheus/values.yaml11
11 files changed, 283 insertions, 3 deletions
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/.helmignore b/vnfs/DAaaS/collection/charts/cadvisor/.helmignore
new file mode 100644
index 00000000..50af0317
--- /dev/null
+++ b/vnfs/DAaaS/collection/charts/cadvisor/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/Chart.yaml b/vnfs/DAaaS/collection/charts/cadvisor/Chart.yaml
new file mode 100644
index 00000000..aea55a29
--- /dev/null
+++ b/vnfs/DAaaS/collection/charts/cadvisor/Chart.yaml
@@ -0,0 +1,19 @@
+# Copyright 2019 Intel Corporation, 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: v1
+appVersion: "1.0"
+description: Cadvisor Helm Chart
+name: cadvisor
+version: 0.1.0
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/NOTES.txt b/vnfs/DAaaS/collection/charts/cadvisor/templates/NOTES.txt
new file mode 100644
index 00000000..3eea9994
--- /dev/null
+++ b/vnfs/DAaaS/collection/charts/cadvisor/templates/NOTES.txt
@@ -0,0 +1,34 @@
+# Copyright (c) 2019 Intel Corporation.
+#
+# 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.
+
+
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range .Values.ingress.hosts }}
+ http://{{ . }}
+{{- end }}
+{{- else if contains "NodePort" .Values.cadvisor_prometheus.service.type }}
+ NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "name" . }})
+ NODE_IPS=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[*].status.addresses[0].address}")
+ visit http://NODE_IP:NODE_PORT
+{{- else if contains "LoadBalancer" .Values.cadvisor_prometheus.service.type }}
+ NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+ You can watch the status of by running 'kubectl get svc -w {{ include "name" . }}'
+ export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+ echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
+{{- else if contains "ClusterIP" .Values.cadvisor_prometheus.service.type }}
+ export POD_NAME=$(kubectl get pods --namespace={{ .Release.Namespace }} -l "app={{ template "name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+ echo "Visit http://127.0.0.1:8080 to use your application"
+ kubectl port-forward $POD_NAME 8080:{{ .Values.cadvisor_prometheus.service.targetPort }}
+{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/_helpers.tpl b/vnfs/DAaaS/collection/charts/cadvisor/templates/_helpers.tpl
new file mode 100644
index 00000000..ea2a3266
--- /dev/null
+++ b/vnfs/DAaaS/collection/charts/cadvisor/templates/_helpers.tpl
@@ -0,0 +1,25 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/* Workaround for https://github.com/helm/helm/issues/3117 */}}
+{{- define "rangeskipempty" -}}
+{{- range $key, $value := . }}
+{{- if $value }}
+{{ $key }}: {{ $value }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/daemonset.yaml b/vnfs/DAaaS/collection/charts/cadvisor/templates/daemonset.yaml
new file mode 100644
index 00000000..1f659f2b
--- /dev/null
+++ b/vnfs/DAaaS/collection/charts/cadvisor/templates/daemonset.yaml
@@ -0,0 +1,77 @@
+{{/*
+# Copyright 2019 Intel Corporation, 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: apps/v1beta2
+kind: DaemonSet
+metadata:
+ name: {{ template "fullname" . }}
+ labels:
+ app: {{ template "name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+spec:
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ name: {{ template "fullname" . }}
+ template:
+ metadata:
+ labels:
+ name: {{ template "fullname" . }}
+ app: {{ template "name" . }}
+ collector: cadvisor
+ release: {{ .Release.Name }}
+ spec:
+ hostNetwork: true
+ containers:
+ - name: {{ .Chart.Name }}
+ image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ securityContext:
+ privileged: true
+ volumeMounts:
+ - name: rootfs
+ mountPath: /rootfs
+ readOnly: true
+ - name: var-run
+ mountPath: /var/run
+ readOnly: false
+ - name: sys
+ mountPath: /sys
+ readOnly: true
+ - name: docker
+ mountPath: /var/lib/docker
+ readOnly: true
+ ports:
+ - name: http
+ containerPort: 8080
+ protocol: TCP
+ args:
+ - --housekeeping_interval=10s
+ terminationGracePeriodSeconds: 30
+ volumes:
+ - name: rootfs
+ hostPath:
+ path: /
+ - name: var-run
+ hostPath:
+ path: /var/run
+ - name: sys
+ hostPath:
+ path: /sys
+ - name: docker
+ hostPath:
+ path: /var/lib/docker
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml b/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml
new file mode 100644
index 00000000..f3432499
--- /dev/null
+++ b/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml
@@ -0,0 +1,34 @@
+{{/*
+# Copyright 2019 Intel Corporation, 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: v1
+kind: Service
+metadata:
+ name: cadvisor
+ labels:
+ app: cadvisor
+ release: {{ .Release.Name }}
+spec:
+ type: NodePort
+ externalTrafficPolicy: Local
+ selector:
+{{ include "rangeskipempty" .Values.cadvisor_prometheus.service.selector | indent 4 }}
+ ports:
+ - name: cadvisor-prometheus
+ protocol: TCP
+ port: {{ .Values.cadvisor_prometheus.service.port }}
+ nodePort: {{ .Values.cadvisor_prometheus.service.nodePort }}
+ targetPort: {{ .Values.cadvisor_prometheus.service.targetPort }}
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/values.yaml b/vnfs/DAaaS/collection/charts/cadvisor/values.yaml
new file mode 100644
index 00000000..8d25ba7f
--- /dev/null
+++ b/vnfs/DAaaS/collection/charts/cadvisor/values.yaml
@@ -0,0 +1,23 @@
+# Default values for cadvisor.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+ingress:
+ enabled: false
+image:
+ repository: google/cadvisor
+ tag: latest
+ pullPolicy: IfNotPresent
+resources: {}
+ # We usually recommend not to specify default resources and to leave this as a conscious
+ # choice for the user. This also increases chances charts run on environments with little
+ # resources, such as Minikube. If you do want to specify resources, uncomment the following
+ # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+cadvisor_prometheus:
+ service:
+ type: NodePort
+ port: 80
+ nodePort: 30091
+ targetPort: 8080
+ selector:
+ app: cadvisor
+ collector: cadvisor
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt b/vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt
index cb1494f1..06ca128b 100644
--- a/vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt
+++ b/vnfs/DAaaS/collection/charts/collectd/templates/NOTES.txt
@@ -1 +1,34 @@
-1. CollectD Charts
+# Copyright (c) 2019 Intel Corporation.
+#
+# 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.
+
+
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range .Values.ingress.hosts }}
+ http://{{ . }}
+{{- end }}
+{{- else if contains "NodePort" .Values.collectd_prometheus.service.type }}
+ NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "name" . }})
+ NODE_IPS=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[*].status.addresses[0].address}")
+ visit http://NODE_IP:NODE_PORT
+{{- else if contains "LoadBalancer" .Values.collectd_prometheus.service.type }}
+ NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+ You can watch the status of by running 'kubectl get svc -w {{ include "name" . }}'
+ export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+ echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
+{{- else if contains "ClusterIP" .Values.collectd_prometheus.service.type }}
+ CLUSTER_NODE_IPS=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[*].status.addresses[0].address}")
+ CLUSTER_NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].port}" services {{ include "name" . }})
+ visit http://CLUSTER_NODE_IP:CLUSTER_NODE_PORT
+{{- end }}
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/service.yaml b/vnfs/DAaaS/collection/charts/collectd/templates/service.yaml
index 37be5cc5..7571715d 100644
--- a/vnfs/DAaaS/collection/charts/collectd/templates/service.yaml
+++ b/vnfs/DAaaS/collection/charts/collectd/templates/service.yaml
@@ -17,7 +17,7 @@
apiVersion: v1
kind: Service
metadata:
- name: collectd-metrics
+ name: collectd
labels:
app: collectd
release: {{ .Release.Name }}
diff --git a/vnfs/DAaaS/collection/charts/collectd/values.yaml b/vnfs/DAaaS/collection/charts/collectd/values.yaml
index 7c2eb669..fdfcae71 100644
--- a/vnfs/DAaaS/collection/charts/collectd/values.yaml
+++ b/vnfs/DAaaS/collection/charts/collectd/values.yaml
@@ -1,7 +1,8 @@
# Default values for collectd.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
-namespace: default
+ingress:
+ enabled: false
image:
repository: opnfv/barometer-collectd
tag: latest
@@ -19,6 +20,7 @@ resources: {}
# memory: 128Mi
collectd_prometheus:
service:
+ type: ClusterIP
port: 9103
targetPort: 9103
selector:
diff --git a/vnfs/DAaaS/collection/charts/prometheus/values.yaml b/vnfs/DAaaS/collection/charts/prometheus/values.yaml
index 08a07751..4398f52f 100644
--- a/vnfs/DAaaS/collection/charts/prometheus/values.yaml
+++ b/vnfs/DAaaS/collection/charts/prometheus/values.yaml
@@ -23,6 +23,17 @@ prometheus:
endpoints:
- port: metrics
interval: 30s
+ - name: service-monitor-cadvisor
+ additionalLabels:
+ collector: cadvisor
+ jobLabel: cadvisor
+ selector:
+ matchLabels:
+ app: cadvisor
+ endpoints:
+ - port: cadvisor-prometheus
+ interval: 10s
+ path: /metrics
service:
annotations: {}