Update docker image (fluid-cloudnative#491)

* Update docker image, To #30961382 Signed-off-by: cheyang <[email protected]> * Update docs, To #30961382 Signed-off-by: cheyang <[email protected]> * Update monitoring docs, To #30961382 Signed-off-by: cheyang <[email protected]> * Update monitoring docs, To #30961382 Signed-off-by: cheyang <[email protected]> * Update monitoring docs, To #30961382 Signed-off-by: cheyang <[email protected]> * Update monitoring docs, To #30961382 Signed-off-by: cheyang <[email protected]> * Update monitoring docs, To #30961382 Signed-off-by: cheyang <[email protected]> * Update monitoring docs, To #30961382 Signed-off-by: cheyang <[email protected]> * Fix deployment yaml, To #30961382 Signed-off-by: cheyang <[email protected]> * Add ai-dashboard, To #30961382 Signed-off-by: cheyang <[email protected]> * Add ai-dashboard, To #30961382 Signed-off-by: cheyang <[email protected]> * Update monitoring docs, To #30961382 Signed-off-by: cheyang <[email protected]>
zhang-x-z · Dec 22, 2020 · f0a3aca · f0a3aca
1 parent 9ac883c
commit f0a3aca
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,12 +25,3 @@ matrix:
         - test -z "$(go fmt ./... 2>/dev/null | tee /dev/stderr)" || (echo "please format Go code with 'gofmt'")
         - make test
         - bash <(curl -s https://codecov.io/bash)
-
-
-    - language: ruby
-      rvm:
-        - 2.6
-      before_script:
-        - gem install mdl
-      script:
-        - mdl . |grep -v 'vendor\|api_doc'
diff --git a/charts/fluid/fluid/Chart.yaml b/charts/fluid/fluid/Chart.yaml
@@ -19,3 +19,9 @@ version: 0.5.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
 appVersion: 0.5.0
+home: https://github.com/fluid-cloudnative/fluid
+keywords:
+  - category:data
+  - fluid
+  - namespace:fluid-system
+  - releaseName:fluid
diff --git a/charts/fluid/fluid/values.yaml b/charts/fluid/fluid/values.yaml
@@ -4,13 +4,13 @@
 
 dataset:
   controller:
-    image: registry.cn-hangzhou.aliyuncs.com/fluid/dataset-controller:v0.5.0-65167d1
+    image: registry.cn-hangzhou.aliyuncs.com/fluid/dataset-controller:v0.5.0-d0d3d80
 
 csi:
   registrar:
     image: registry.cn-hangzhou.aliyuncs.com/acs/csi-node-driver-registrar:v1.2.0
   plugins:
-    image: registry.cn-hangzhou.aliyuncs.com/fluid/fluid-csi:v0.5.0-65167d1
+    image: registry.cn-hangzhou.aliyuncs.com/fluid/fluid-csi:v0.5.0-d0d3d80
   kubelet:
     rootDir: /var/lib/kubelet
 
@@ -19,9 +19,9 @@ runtime:
   alluxio:
     enabled: true
     init:
-      image: registry.cn-hangzhou.aliyuncs.com/fluid/init-users:v0.5.0-65167d1
+      image: registry.cn-hangzhou.aliyuncs.com/fluid/init-users:v0.5.0-d0d3d80
     controller:
-      image: registry.cn-hangzhou.aliyuncs.com/fluid/alluxioruntime-controller:v0.5.0-65167d1
+      image: registry.cn-hangzhou.aliyuncs.com/fluid/alluxioruntime-controller:v0.5.0-d0d3d80
     runtime:
       image: registry.cn-huhehaote.aliyuncs.com/alluxio/alluxio:2.3.0-SNAPSHOT-985b84c
     fuse:
@@ -31,4 +31,4 @@ runtime:
   jindo:
     enabled: true
     controller:
-      image: registry.cn-hangzhou.aliyuncs.com/fluid/jindoruntime-controller:v0.5.0-65167d1
+      image: registry.cn-hangzhou.aliyuncs.com/fluid/jindoruntime-controller:v0.5.0-d0d3d80
diff --git a/docs/zh/TOC.md b/docs/zh/TOC.md
@@ -13,12 +13,15 @@
 + 示例
   - [数据加速（通过POSIX接口访问）](samples/accelerate_data_accessing.md)
   - [数据加速（通过HDFS接口访问）](samples/accelerate_data_accessing_by_hdfs.md)
+  - [使用参数加密](samples/use_encryptoptions.md)
   - [缓存亲和性调度](samples/data_co_locality.md)
   - [机器学习](samples/machinelearning.md)
   - [主机目录加速](samples/hostpath.md)
   - [数据卷加速](samples/accelerate_pvc.md)
   - [以non-root用户身份使用Fluid](samples/nonroot_access.md)
   - [数据预加载](samples/data_warmup.md)
++ 运维指南
+  - [运行时监控](operation/monitoring.md)
 + 开发者指南
   - [如何参与开发](dev/how_to_develop.md)
   - [API_Doc](dev/api_doc.md)

diff --git a/docs/zh/userguide/monitoring.md → docs/zh/operation/monitoring.md b/docs/zh/userguide/monitoring.md → docs/zh/operation/monitoring.md
@@ -15,12 +15,14 @@ Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc)
 #### 1. 部署或配置 Prometheus
 
 如果集群内无 prometheus:
+
 ```shell
 $ cd fluid
-$ kubectl apply -f monitoring/prometheus.yaml
+$ kubectl apply -f tools/monitoring/prometheus.yaml
 ```
 
 如集群内有 prometheus,可将以下配置写到 prometheus 配置文件中:
+
 ```yaml
 scrape_configs:
   - job_name: 'alluxio master'
@@ -57,20 +59,22 @@ $ docker run -d \
   grafana/grafana
 # In-CLuster 部署
 $ cd fluid
-$ kubectl apply -f monitoring/grafana.yaml 
+$ kubectl apply -f tools/monitoring/grafana.yaml 
 ```
 
 
 #### 3. 配置 grafana
 
 1. 登录 grafana
 如果以docker 方式部署，访问 `http://$grafana-node-ip:3000`;以 In-CLuster 方式部署，访问`http://$grafana-node-ip:NodePort`，默认账号密码 `admin:admin`:
+
 ```
 # 查看 NodePort
 $ kubectl describe svc monitoring-grafana -n kube-system
 ```
 
 2. 首先查看 prometheus svc 端口
+
 ```
 $ kubectl get svc -n kube-system | grep prometheus-svc
 prometheus-svc             NodePort    10.100.0.144   <none>        9090:31245/TCP           22h
@@ -94,12 +98,14 @@ Events:                   <none>
 ```
 
 3. 配置 prometheus data source
+
 ![](../../media/images/grafana-prometheus-setting.jpg)
+
 注: 如果 grafana In-Cluster 部署， URL 填写 Service Endpoints 即可；如果以 docker 方式部署，URL 填写prometheus 部署节点 ip:NodePort 即可
 导入完成后点击Save & Test 显示 Data source is working 即可
 
 4. 导入模板文件
-grafana 选择导入模板 Json 文件 `fluid-prometheus-grafana-monitor.json`
+grafana 选择导入模板 Json 文件 `fluid-prometheus-grafana-monitor.json`, 它的位置是`tools/monitoring/fluid-prometheus-grafana-monitor.json`
 
 5. 启动 fluid 任务
 ```yaml
@@ -110,16 +116,8 @@ metadata:
   name: monitoring
 spec:
   mounts:
-    - mountPoint: local:///mnt/monitoring/
-      name: monitoring
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-        - matchExpressions:
-            - key: monitoring
-              operator: In
-              values:
-                - "true"
+    - mountPoint: https://mirror.bit.edu.cn/apache/spark/
+      name: spark
 ---
 apiVersion: data.fluid.io/v1alpha1
 kind: AlluxioRuntime
@@ -134,6 +132,12 @@ spec:
         quota: 2Gi
         high: "0.95"
         low: "0.7"
+  properties:
+    alluxio.user.block.size.bytes.default: 256MB
+    alluxio.user.streaming.reader.chunk.size.bytes: 256MB
+    alluxio.user.local.reader.chunk.size.bytes: 256MB
+    alluxio.worker.network.reader.buffer.size: 256MB
+    alluxio.user.streaming.data.timeout: 300sec
   fuse:
     args:
     - fuse
@@ -145,5 +149,7 @@ EOF
 
 6. 查看监控
 在 grafana HOME 中知道名为Fluid-Prometheus-Grafana-Monitor视图即可，如下所示:
+
 ![](../../media/images/grafana-monitor.jpg)
+
 注：User of runtime 对应Fluid Alluxio runtime user; fluid_runtime 对应Fluid runtime name; namespace 对应Fluid runtime namespace
diff --git a/...ing/fluid-prometheus-grafana-monitor.json → ...ing/fluid-prometheus-grafana-monitor.json b/...ing/fluid-prometheus-grafana-monitor.json → ...ing/fluid-prometheus-grafana-monitor.json
diff --git a/monitoring/grafana.yaml → tools/monitoring/grafana.yaml b/monitoring/grafana.yaml → tools/monitoring/grafana.yaml
@@ -1,15 +1,18 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: monitoring-grafana
   namespace: kube-system
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: grafana
   template:
     metadata:
       labels:
         task: monitoring
-        k8s-app: grafana
+        app: grafana
     spec:
       containers:
         - name: grafana
@@ -32,4 +35,4 @@ spec:
       targetPort: 3000
   type: NodePort
   selector:
-    k8s-app: grafana
+    app: grafana
diff --git a/monitoring/prometheus.yaml → tools/monitoring/prometheus.yaml b/monitoring/prometheus.yaml → tools/monitoring/prometheus.yaml
@@ -46,7 +46,7 @@ subjects:
   name: prometheus
   namespace: kube-system
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: prometheus-deployment