SeldonIO · gsunner · Jan 25, 2018 · Jan 25, 2018 · Jan 25, 2018 · Jan 25, 2018
diff --git a/helm-charts/Makefile b/helm-charts/Makefile
@@ -1,4 +1,4 @@
-CHARTS=seldon-core seldon-core-loadtesting
+CHARTS=seldon-core seldon-core-analytics seldon-core-kafka seldon-core-loadtesting
 
 
 build_all:

diff --git a/helm-charts/seldon-core-analytics/Chart.yaml b/helm-charts/seldon-core-analytics/Chart.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+description: Seldon Core Analytics
+keywords:
+- seldon-core
+- kubernetes
+- machine-learning
+- prometheus
+- grafana
+name: seldon-core-analytics
+sources:
+- https://github.com/SeldonIO/seldon-core
+version: 0.1
diff --git a/...re/files/alertmanager/config.yaml.example → ...cs/files/alertmanager/config.yaml.example b/...re/files/alertmanager/config.yaml.example → ...cs/files/alertmanager/config.yaml.example
diff --git a/...a/configs/grafana-net-2115-dashboard.json → ...a/configs/grafana-net-2115-dashboard.json b/...a/configs/grafana-net-2115-dashboard.json → ...a/configs/grafana-net-2115-dashboard.json
diff --git a/.../grafana/configs/import-dashboards-job.sh → .../grafana/configs/import-dashboards-job.sh b/.../grafana/configs/import-dashboards-job.sh → .../grafana/configs/import-dashboards-job.sh
diff --git a/...afana/configs/metrics-test-dashboard.json → ...afana/configs/metrics-test-dashboard.json b/...afana/configs/metrics-test-dashboard.json → ...afana/configs/metrics-test-dashboard.json
diff --git a/...figs/predictions-analytics-dashboard.json → ...figs/predictions-analytics-dashboard.json b/...figs/predictions-analytics-dashboard.json → ...figs/predictions-analytics-dashboard.json
diff --git a/...rafana/configs/prometheus-datasource.json → ...rafana/configs/prometheus-datasource.json b/...rafana/configs/prometheus-datasource.json → ...rafana/configs/prometheus-datasource.json
diff --git a/...les/prometheus/LINKS-WORKAROUND-NOTES.txt → ...les/prometheus/LINKS-WORKAROUND-NOTES.txt b/...les/prometheus/LINKS-WORKAROUND-NOTES.txt → ...les/prometheus/LINKS-WORKAROUND-NOTES.txt
diff --git a/...prometheus/prometheus-config-default.yaml → ...prometheus/prometheus-config-default.yaml b/...prometheus/prometheus-config-default.yaml → ...prometheus/prometheus-config-default.yaml
diff --git a/...theus/prometheus-config-test-dynamic.yaml → ...theus/prometheus-config-test-dynamic.yaml b/...theus/prometheus-config-test-dynamic.yaml → ...theus/prometheus-config-test-dynamic.yaml
diff --git a/...etheus/prometheus-config-test-static.yaml → ...etheus/prometheus-config-test-static.yaml b/...etheus/prometheus-config-test-static.yaml → ...etheus/prometheus-config-test-static.yaml
diff --git a/...e/files/prometheus/prometheus-config.yaml → ...s/files/prometheus/prometheus-config.yaml b/...e/files/prometheus/prometheus-config.yaml → ...s/files/prometheus/prometheus-config.yaml
diff --git a/.../prometheus/rules.default/cpu-usage.rules → .../prometheus/rules.default/cpu-usage.rules b/.../prometheus/rules.default/cpu-usage.rules → .../prometheus/rules.default/cpu-usage.rules
diff --git a/...rules.default/instance-availability.rules → ...rules.default/instance-availability.rules b/...rules.default/instance-availability.rules → ...rules.default/instance-availability.rules
diff --git a/...etheus/rules.default/low-disk-space.rules → ...etheus/rules.default/low-disk-space.rules b/...etheus/rules.default/low-disk-space.rules → ...etheus/rules.default/low-disk-space.rules
diff --git a/.../prometheus/rules.default/mem-usage.rules → .../prometheus/rules.default/mem-usage.rules b/.../prometheus/rules.default/mem-usage.rules → .../prometheus/rules.default/mem-usage.rules
diff --git a/...re/files/prometheus/rules/cpu-usage.rules → ...cs/files/prometheus/rules/cpu-usage.rules b/...re/files/prometheus/rules/cpu-usage.rules → ...cs/files/prometheus/rules/cpu-usage.rules
diff --git a/...metheus/rules/instance-availability.rules → ...metheus/rules/instance-availability.rules b/...metheus/rules/instance-availability.rules → ...metheus/rules/instance-availability.rules
diff --git a/...les/prometheus/rules/low-disk-space.rules → ...les/prometheus/rules/low-disk-space.rules b/...les/prometheus/rules/low-disk-space.rules → ...les/prometheus/rules/low-disk-space.rules
diff --git a/...re/files/prometheus/rules/mem-usage.rules → ...cs/files/prometheus/rules/mem-usage.rules b/...re/files/prometheus/rules/mem-usage.rules → ...cs/files/prometheus/rules/mem-usage.rules
diff --git a/helm-charts/seldon-core-analytics/templates/NOTES.txt b/helm-charts/seldon-core-analytics/templates/NOTES.txt
@@ -0,0 +1,2 @@
+NOTES: TODO
+
diff --git a/...plates/alertmanager-config-configmap.yaml → ...plates/alertmanager-config-configmap.yaml b/...plates/alertmanager-config-configmap.yaml → ...plates/alertmanager-config-configmap.yaml
diff --git a/...re/templates/alertmanager-deployment.json → ...cs/templates/alertmanager-deployment.json b/...re/templates/alertmanager-deployment.json → ...cs/templates/alertmanager-deployment.json
diff --git a/...es/grafana-prom-dashboards-configmap.yaml → ...es/grafana-prom-dashboards-configmap.yaml b/...es/grafana-prom-dashboards-configmap.yaml → ...es/grafana-prom-dashboards-configmap.yaml
diff --git a/...re/templates/grafana-prom-deployment.json → ...cs/templates/grafana-prom-deployment.json b/...re/templates/grafana-prom-deployment.json → ...cs/templates/grafana-prom-deployment.json
diff --git a/...s/grafana-prom-import-dashboards-job.json → ...s/grafana-prom-import-dashboards-job.json b/...s/grafana-prom-import-dashboards-job.json → ...s/grafana-prom-import-dashboards-job.json
diff --git a/...n-core/templates/grafana-prom-secret.yaml → ...lytics/templates/grafana-prom-secret.yaml b/...n-core/templates/grafana-prom-secret.yaml → ...lytics/templates/grafana-prom-secret.yaml
diff --git a/...re/templates/node-exporter-daemonset.json → ...cs/templates/node-exporter-daemonset.json b/...re/templates/node-exporter-daemonset.json → ...cs/templates/node-exporter-daemonset.json
diff --git a/...core/templates/prometheus-deployment.json → ...tics/templates/prometheus-deployment.json b/...core/templates/prometheus-deployment.json → ...tics/templates/prometheus-deployment.json
diff --git a/...templates/prometheus-rules-configmap.yaml → ...templates/prometheus-rules-configmap.yaml b/...templates/prometheus-rules-configmap.yaml → ...templates/prometheus-rules-configmap.yaml
diff --git a/...tes/prometheus-server-conf-configmap.yaml → ...tes/prometheus-server-conf-configmap.yaml b/...tes/prometheus-server-conf-configmap.yaml → ...tes/prometheus-server-conf-configmap.yaml
diff --git a/helm-charts/seldon-core-analytics/values.yaml b/helm-charts/seldon-core-analytics/values.yaml
@@ -0,0 +1,7 @@
+alertmanager:
+  config:
+    enabled: false
+grafana_prom_service_type: NodePort
+grafana_prom_admin_password: admin
+persistence:
+  enabled: true
diff --git a/helm-charts/seldon-core-kafka/Chart.yaml b/helm-charts/seldon-core-kafka/Chart.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+description: Seldon Core Kafka
+keywords:
+- seldon-core
+- kafka
+name: seldon-core-kafka
+sources:
+- https://github.com/SeldonIO/seldon-core
+version: 0.1
diff --git a/helm-charts/seldon-core-kafka/templates/NOTES.txt b/helm-charts/seldon-core-kafka/templates/NOTES.txt
@@ -0,0 +1,2 @@
+NOTES: TODO
+
diff --git a/...ldon-core/templates/kafka-deployment.yaml → ...ore-kafka/templates/kafka-deployment.yaml b/...ldon-core/templates/kafka-deployment.yaml → ...ore-kafka/templates/kafka-deployment.yaml
diff --git a/...-core/templates/zookeeper-deployment.yaml → ...kafka/templates/zookeeper-deployment.yaml b/...-core/templates/zookeeper-deployment.yaml → ...kafka/templates/zookeeper-deployment.yaml
diff --git a/helm-charts/seldon-core-kafka/values.yaml b/helm-charts/seldon-core-kafka/values.yaml
@@ -0,0 +1,6 @@
+kafka_core:
+  image:
+    tag: '0.1'
+zookeeper:
+  image:
+    tag: '1.0'
diff --git a/helm-charts/seldon-core/templates/kube-apiserver.yaml b/helm-charts/seldon-core/templates/kube-apiserver.yaml
diff --git a/helm-charts/seldon-core/values.yaml b/helm-charts/seldon-core/values.yaml
@@ -1,6 +1,3 @@
-alertmanager:
-  config:
-    enabled: false
 apife:
   image:
     pull_policy: IfNotPresent
@@ -17,17 +14,6 @@ cluster_manager:
 engine:
   image:
     tag: 0.1.3-SNAPSHOT
-grafana_prom_service_type: NodePort
-kafka_core:
-  image:
-    tag: '0.1'
-kube_apiserver:
-  enabled: false
-persistence:
-  enabled: true
 redis:
   image:
     tag: 4.0.1
-zookeeper:
-  image:
-    tag: '1.0'
diff --git a/helm-charts/seldon-core/values.yaml.example b/helm-charts/seldon-core/values.yaml.example
@@ -29,28 +29,8 @@ zookeeper:
 redis:
   image:
     tag: "4.0.1"
-kube_apiserver:
-  enabled: false
-
-
-alertmanager:
-  # config disabled by default, create file "/files/alertmanager/config.yaml" then enable
-  config:
-    enabled: false
-
-
-# set the grafana admin password
-#grafana_prom_admin_password:
-
-# Set the type of service for Grafana Prom
-#grafana_prom_service_type: LoadBalancer
-grafana_prom_service_type: NodePort
 
 # Set the type of service for apife
 #apife_service_type: LoadBalancer
 apife_service_type: NodePort
 
-# Persist data to a persitent volume
-persistence:
-  enabled: true
-
diff --git a/notebooks/advanced_graphs.ipynb b/notebooks/advanced_graphs.ipynb
@@ -45,9 +45,7 @@
    "source": [
     "!helm install ../helm-charts/seldon-core --name seldon-core \\\n",
     "        --set cluster_manager.rbac=true \\\n",
-    "        --set cluster_manager_client_secret=secret \\\n",
     "        --set cluster_manager_service_type=LoadBalancer \\\n",
-    "        --set grafana_prom_service_type=LoadBalancer \\\n",
     "        --set apife_service_type=LoadBalancer"
    ]
   },
@@ -767,7 +765,7 @@
  "metadata": {
   "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python [default]",
+   "display_name": "Python 2",
    "language": "python",
    "name": "python2"
   },
@@ -781,7 +779,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython2",
-   "version": "2.7.12"
+   "version": "2.7.11"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/kubectl_demo_gcp.ipynb b/notebooks/kubectl_demo_gcp.ipynb
@@ -57,9 +57,7 @@
    "source": [
     "!helm install ../helm-charts/seldon-core --name seldon-core \\\n",
     "        --set cluster_manager.rbac=true \\\n",
-    "        --set cluster_manager_client_secret=secret \\\n",
     "        --set cluster_manager_service_type=LoadBalancer \\\n",
-    "        --set grafana_prom_service_type=LoadBalancer \\\n",
     "        --set apife_service_type=LoadBalancer"
    ]
   },
@@ -82,6 +80,13 @@
     "!python -m grpc.tools.protoc -I./proto --python_out=./proto --grpc_python_out=./proto ./proto/prediction.proto"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Setup pyhton code to do RESR and gRPC requests. **Only run this when the LoadBalancer created by GCP for the seldon-apife is running**"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,