LICENSE

@@ -1,13 +1,21 @@
-Copyright 2013, 2014, 2015, 2016 Engine Yard, Inc.
+The MIT License (MIT)
 
-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
+Copyright (c) Microsoft Corporation. All rights reserved.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-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.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,3 +1,10 @@
+
+|![](https://upload.wikimedia.org/wikipedia/commons/thumb/1/17/Warning.svg/156px-Warning.svg.png) | Deis Workflow is no longer maintained.<br />Please [read the announcement](https://deis.com/blog/2017/deis-workflow-final-release/) for more detail. |
+|---:|---|
+| 09/07/2017 | Deis Workflow [v2.18][] final release before entering maintenance mode |
+| 03/01/2018 | End of Workflow maintenance: critical patches no longer merged |
+| | [Hephy](https://github.com/teamhephy/workflow) is a fork of Workflow that is actively developed and accepts code contributions. |
+
 # Deis Monitor v2
 [![Build Status](https://ci.deis.io/job/monitor/badge/icon)](https://ci.deis.io/job/monitor)
 [![Docker Repository on Quay](https://quay.io/repository/deisci/grafana/status "Docker Repository on Quay")](https://quay.io/repository/deisci/grafana)
@@ -23,51 +30,37 @@ Lastly, Grafana is a stand alone graphing application. It natively supports Infl
 # Architecture Diagram
 
 ```
-                        ┌────────┐                            
+                        ┌────────┐
                         │ Router │                  ┌────────┐
                         └────────┘                  │ Logger │
                             │                       └────────┘
-                        Log file                        │    
-                            │                           │    
-                            ▼                           ▼    
+                        Log file                        │
+                            │                           │
+                            ▼                           ▼
 ┌────────┐             ┌─────────┐    logs/metrics   ┌─────┐
 │App Logs│──Log File──▶│ fluentd │───────topics─────▶│ NSQ │
 └────────┘             └─────────┘                   └─────┘
-                                                        │    
-                                                        │    
-┌─────────────┐                                         │    
-│ HOST        │                                         ▼    
+                                                        │
+                                                        │
+┌─────────────┐                                         │
+│ HOST        │                                         ▼
 │  Telegraf   │───┐                                ┌────────┐
 └─────────────┘   │                                │Telegraf│
                   │                                └────────┘
-┌─────────────┐   │                                    │    
-│ HOST        │   │    ┌───────────┐                   │    
-│  Telegraf   │───┼───▶│ InfluxDB  │◀────Wire ─────────┘    
-└─────────────┘   │    └───────────┘   Protocol       
-                  │          ▲                        
-┌─────────────┐   │          │                        
-│ HOST        │   │          ▼                        
-│  Telegraf   │───┘    ┌──────────┐                   
-└─────────────┘        │ Grafana  │                   
-                       └──────────┘                                        
+┌─────────────┐   │                                    │
+│ HOST        │   │    ┌───────────┐                   │
+│  Telegraf   │───┼───▶│ InfluxDB  │◀────Wire ─────────┘
+└─────────────┘   │    └───────────┘   Protocol
+                  │          ▲
+┌─────────────┐   │          │
+│ HOST        │   │          ▼
+│  Telegraf   │───┘    ┌──────────┐
+└─────────────┘        │ Grafana  │
+                       └──────────┘
 ```
 
-
-## License
-Copyright 2013, 2014, 2015, 2016 Engine Yard, 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.
-
 [k8s-home]: http://kubernetes.io/
 [issues]: https://github.com/deis/monitor/issues
 [prs]: https://github.com/deis/monitor/pulls
+[v2.18]: https://github.com/deis/workflow/releases/tag/v2.18.0
+

charts/monitor/charts/telegraf/templates/monitor-telegraf-daemon.yaml

@@ -7,6 +7,10 @@ metadata:
   annotations:
     component.deis.io/version: {{ .Values.docker_tag }}
 spec:
+  {{- if ge .Capabilities.KubeVersion.Minor "6" }}
+  updateStrategy:
+    type: RollingUpdate
+  {{- end }}
   template:
     metadata:
       labels:

charts/monitor/charts/telegraf/templates/monitor-telegraf-role.yaml

@@ -0,0 +1,15 @@
+{{- if (.Values.global.use_rbac) -}}
+{{- if (.Capabilities.APIVersions.Has (include "rbacAPIVersion" .)) -}}
+kind: Role
+apiVersion: {{ template "rbacAPIVersion" . }}
+metadata:
+  name: deis-monitor-telegraf
+  labels:
+    app: deis-monitor-telegraf
+    heritage: deis
+rules:
+- apiGroups: [""]
+  resources: ["pods"]
+  verbs: ["get"]
+{{- end -}}
+{{- end -}}

charts/monitor/charts/telegraf/templates/monitor-telegraf-rolebinding.yaml

@@ -0,0 +1,18 @@
+{{- if (.Values.global.use_rbac) -}}
+{{- if (.Capabilities.APIVersions.Has (include "rbacAPIVersion" .)) -}}
+kind: RoleBinding
+apiVersion: {{ template "rbacAPIVersion" . }}
+metadata:
+  name: deis-monitor-telegraf
+  labels:
+    app: deis-monitor-telegraf
+    heritage: deis
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: deis-monitor-telegraf
+subjects:
+- kind: ServiceAccount
+  name: deis-monitor-telegraf
+{{- end -}}
+{{- end -}}

charts/monitor/templates/_helpers.tmpl

@@ -0,0 +1,10 @@
+{{/*
+Set apiVersion based on Kubernetes version
+*/}}
+{{- define "rbacAPIVersion" -}}
+{{- if ge .Capabilities.KubeVersion.Minor "6" -}}
+rbac.authorization.k8s.io/v1beta1
+{{- else -}}
+rbac.authorization.k8s.io/v1alpha1
+{{- end -}}
+{{- end -}}

charts/monitor/values.yaml

@@ -49,3 +49,5 @@ global:
   # - on-cluster: Run Redis within the Kubernetes cluster
   # - off-cluster: Run Redis outside the Kubernetes cluster (configure in loggerRedis section)
   logger_redis_location: "on-cluster"
+  # Role-Based Access Control for Kubernetes >= 1.5
+  use_rbac: false

default.mk

@@ -8,37 +8,34 @@ IMAGE_PREFIX ?= deis
 
 include ../includes.mk
 include ../versioning.mk
+include ../deploy.mk
 
 TEST_ENV_PREFIX := docker run --rm -v ${CURDIR}:/bash -w /bash quay.io/deis/shell-dev
 
 build: docker-build
 push: docker-push
-deploy: check-kubectl docker-build docker-push upgrade
+deploy: check-kubectl docker-build docker-push install
 
 docker-build:
 	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
 clean: check-docker
 	docker rmi $(IMAGE)
-
-KD = kubectl --namespace=deis
-upgrade:
-	${KD} patch ${RESOURCE_TYPE} deis-monitor-${SHORT_NAME} \
-		--type='json' \
-		-p='[ \
-			{"op": "replace", "path": "/spec/strategy", "value":{"type":"Recreate"}}, \
-			{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}, \
-			{"op": "replace", "path": "/spec/template/spec/containers/0/imagePullPolicy", "value":"Always"} \
-		]'
-	@if [ "${RESOURCE_TYPE}" == "daemonset" ]; then \
-		echo "Deleting daemonset pods as they aren't yet recreated when daemonset is patched..."; \
-		${KD} delete $$(${KD} get pod -o name | grep "${SHORT_NAME}"); \
-	fi
-
+
 test: test-style
 
 test-style:
 	${TEST_ENV_PREFIX} shellcheck $(SHELL_SCRIPTS)
 
 .PHONY: build push docker-build clean upgrade deploy test test-style
+
+build-all:
+	docker build ${DOCKER_BUILD_FLAGS} -t ${DEIS_REGISTRY}${IMAGE_PREFIX}/grafana:${VERSION} ../grafana/rootfs
+	docker build ${DOCKER_BUILD_FLAGS} -t ${DEIS_REGISTRY}${IMAGE_PREFIX}/influxdb:${VERSION} ../influxdb/rootfs
+	docker build ${DOCKER_BUILD_FLAGS} -t ${DEIS_REGISTRY}${IMAGE_PREFIX}/telegraf:${VERSION} ../telegraf/rootfs
+
+push-all:
+	docker push ${DEIS_REGISTRY}${IMAGE_PREFIX}/grafana:${VERSION}
+	docker push ${DEIS_REGISTRY}${IMAGE_PREFIX}/influxdb:${VERSION}
+	docker push ${DEIS_REGISTRY}${IMAGE_PREFIX}/telegraf:${VERSION}

deploy.mk

@@ -0,0 +1,9 @@
+install:
+	helm upgrade monitor ../charts/monitor --install --namespace deis --set grafana.org=${IMAGE_PREFIX},grafana.docker_tag=${VERSION},influxdb.org=${IMAGE_PREFIX},influxdb.docker_tag=${VERSION},telegraf.org=${IMAGE_PREFIX},telegraf.docker_tag=${VERSION}
+
+
+upgrade: 
+	helm upgrade monitor ../charts/monitor --namespace deis --set grafana.org=${IMAGE_PREFIX},grafana.docker_tag=${VERSION},telegraf.org=${IMAGE_PREFIX},telegraf.docker_tag=${VERSION},influxdb.org=${IMAGE_PREFIX},influxdb.docker_tag=${VERSION}
+
+uninstall:
+	helm delete monitor --purge

grafana/Makefile

@@ -1,5 +1,4 @@
 SHORT_NAME ?= grafana
-RESOURCE_TYPE := deployment
 SHELL_SCRIPTS = rootfs/usr/share/grafana/start-grafana
 
 include ../default.mk

grafana/rootfs/Dockerfile

@@ -6,7 +6,7 @@ RUN apt-get update && \
 	apt-get install -y libfontconfig && \
 	curl -fsSL -o /usr/share/grafana/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 && \
 	chmod +x /usr/share/grafana/envtpl && \
-	curl -fsSo /tmp/grafana.deb https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.2-1481203731_amd64.deb && \
+	curl -fsSo /tmp/grafana.deb https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_4.3.2_amd64.deb && \
 	dpkg -i /tmp/grafana.deb && \
 	rm /tmp/grafana.deb && \
 	rm /etc/grafana/grafana.ini && \

influxdb/Makefile

@@ -1,5 +1,4 @@
 SHORT_NAME ?= influxdb
-RESOURCE_TYPE := deployment
 SHELL_SCRIPTS = rootfs/home/influxdb/start-influx
 
 include ../default.mk

telegraf/Makefile

@@ -1,5 +1,4 @@
 SHORT_NAME ?= telegraf
-RESOURCE_TYPE := daemonset
 SHELL_SCRIPTS = rootfs/start-telegraf
 
 include ../default.mk

telegraf/rootfs/Dockerfile

@@ -4,12 +4,10 @@ COPY . /
 
 RUN mkdir -p /usr/local/bin/ \
   # This will come back once the kuberentes plugin is release in November
-  # && curl -fsSL -o /tmp/telegraf.deb https://dl.influxdata.com/telegraf/releases/telegraf_1.0.0_amd64.deb \
-  # && dpkg -i /tmp/telegraf.deb \
-  # && rm /tmp/telegraf.deb \
-  && curl -fsSL -o /usr/bin/telegraf https://storage.googleapis.com/telegraf/telegraf \
-  && chmod +x /usr/bin/telegraf \
-	&& curl -fsSL -o /usr/bin/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 \
+  && curl -fsSL -o /tmp/telegraf.deb https://dl.influxdata.com/telegraf/releases/telegraf_1.3.0-1_amd64.deb \
+  && dpkg -i /tmp/telegraf.deb \
+  && rm /tmp/telegraf.deb \
+  && curl -fsSL -o /usr/bin/envtpl https://github.com/arschles/envtpl/releases/download/0.2.3/envtpl_linux_amd64 \
 	&& chmod +x /usr/bin/envtpl \
   && curl -fsSL -o /usr/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64 \
   && chmod +x /usr/bin/jq