update

plugins/loki/conf/promtail-config.yaml

@@ -9,13 +9,13 @@ clients:
   - url: http://127.0.0.1:3100/loki/api/v1/push    #修改为loki服务器IP
 
 scrape_configs:
-- job_name: fap
+- job_name: web
   static_configs:
   - targets:
       - localhost
     labels:
-      job: "HSJ_fap"
-      __path__: /opt/cwy8.32/product/module/P/FAP/nohup.out
+      job: "web"
+      __path__: {$LOG_PATH}/web_nohup.out
 
 - job_name: portal
   static_configs:
@@ -24,43 +24,3 @@ scrape_configs:
     labels:
       job: "HSJ_portal"
       __path__: /opt/cwy8.32/product/module/P/PORTAL/nohup.out
-
-- job_name: cwy
-  static_configs:
-  - targets:
-      - localhost
-    labels:
-      job: "HSJ_cwy"
-      __path__: /opt/cwy8.32/product/module/A/CWY/nohup.out
-
-- job_name: fasp_register
-  static_configs:
-  - targets:
-      - localhost
-    labels:
-      job: "HSJ_fasp_register"
-      __path__: /opt/cwy8.32/product/module/A/FASP/register-nohup.out
-
-- job_name: fasp_gateway
-  static_configs:
-  - targets:
-      - localhost
-    labels:
-      job: "HSJ_fasp_gateway"
-      __path__: /opt/cwy8.32/product/module/A/FASP/gateway-nohup.out
-
-- job_name: fasp_base
-  static_configs:
-  - targets:
-      - localhost
-    labels:
-      job: "HSJ_fasp_base"
-      __path__: /opt/cwy8.32/product/module/A/FASP/base-nohup.out
-
-- job_name: fasp_web
-  static_configs:
-  - targets:
-      - localhost
-    labels:
-      job: "HSJ_fasp_web"
-      __path__: /opt/cwy8.32/product/module/A/FASP/web-nohup.out

plugins/loki/index.py

@@ -106,6 +106,8 @@ def contentReplace(content):
     service_path = mw.getServerDir()
     content = content.replace('{$ROOT_PATH}', mw.getFatherDir())
     content = content.replace('{$SERVER_PATH}', service_path)
+    content = content.replace('{$APP_PATH}', service_path+"/loki")
+    content = content.replace('{$LOG_PATH}', service_path+"/loki/logs")
     return content
 
 

plugins/loki/versions/3.5.3/linux.sh

@@ -36,6 +36,7 @@ Install_App()
 	mkdir -p ${SourceDir}
 	mkdir -p ${InstallDir}
 	mkdir -p ${InstallDir}/bin
+	mkdir -p ${InstallDir}/logs
 	mkdir -p ${InstallDir}/data/{chunks,rules,boltdb-shipper-active,boltdb-shipper-cache}
 
 	if [ ! -f ${SourceDir}/${FILE_TGZ} ];then
@@ -72,8 +73,8 @@ Uninstall_App()
 # MemoryLimit=1G
 # CPUQuota=200%
 
-# curl -v -H "Content-Type: application/json" -XPOST  "http://localhost:3100/loki/api/v1/push" \
-# -d "{\"streams\": [{\"stream\": {\"test\": \"test\"}, \"values\": [[\"$timestamp\", \"test message\"]]}]}"
+curl -v -H "Content-Type: application/json" -XPOST  "http://localhost:3100/loki/api/v1/push" \
+-d "{\"streams\": [{\"stream\": {\"test\": \"test\"}, \"values\": [[\"$timestamp\", \"test message\"]]}]}"
 
 action=${1}
 if [ "${1}" == 'install' ];then