dever 7 lat temu
rodzic
commit
6d68012e3a

+ 1 - 0
container/conf/elastic/filebeat/filebeat.yml

@@ -42,6 +42,7 @@ filebeat.prospectors:
   #fields:
   #  level: debug
   #  review: 1
+  close_older: 24h
 
   ### Multiline options
 

+ 2 - 3
container/conf/elastic/filebeat/pipeline.json

@@ -1,11 +1,10 @@
 {
-  "description" : "test-pipeline",
+  "description" : "applet-pipeline",
   "processors" : [
     {
       "grok" :{
         "field" : "message",
-        "patterns" :["%{IP:client} %{WORD:method} %{URIPATHPARAM:request} %{NUMBER:bytes} %{NUMBER:duration}"
-        ]
+        "patterns" :["%{GREEDYDATA:createtime} %{GREEDYDATA:typename} %{GREEDYDATA:process}: &project=%{GREEDYDATA:project}&appid=%{GREEDYDATA:appid}&uuid=%{GREEDYDATA:uuid}&method=%{GREEDYDATA:method}&error=%{GREEDYDATA:error}&pagepath=%{GREEDYDATA:pagepath}&cdate=%{GREEDYDATA:cdate}&fontSizeSetting=%{GREEDYDATA:fontSizeSetting}&platform=%{GREEDYDATA:platform}&system=%{GREEDYDATA:system}&version=%{GREEDYDATA:version}&language=%{GREEDYDATA:language}&screenHeight=%{GREEDYDATA:screenHeight}&screenWidth=%{GREEDYDATA:screenWidth}&pixelRatio=%{GREEDYDATA:pixelRatio}&model=%{GREEDYDATA:model}&brand=%{GREEDYDATA:brand}&country=%{GREEDYDATA:country}&province=%{GREEDYDATA:province}&city=%{GREEDYDATA:city}&sex=%{GREEDYDATA:sex}&name=%{GREEDYDATA:name}&uid=%{INT:uid}"]
       }
     }
 

+ 7 - 1
container/conf/web/nginx/conf.d/site.conf

@@ -10,11 +10,17 @@ server {
 
     set $rootdir /www;
 
-    if ( $request_uri ~* ^/(dever_package\/manage|dever_package\/ui) ) {
+    if ( $request_uri ~* ^/(dever_package\/manage|dever_package\/ui|dever_package\/script) ) {
         set $rootdir /share/lib/php;
     }
     root $rootdir;
     index index.php index.html;
+    if ( $request_uri ~* /(applet\/content|applet_on\/content) ) {
+            rewrite ^/(.*)/content/(.*) /$1/content/index.php?$2 last;
+    }
+    if ( $request_uri ~* /log\/data.add ) {
+            rewrite ^/log/(.*?) /log/index.php?$1 last;
+    }
     location / {
                 # First attempt to serve request as file, then
                 # as directory, then fall back to displaying a 404.

+ 1 - 0
install

@@ -7,6 +7,7 @@ check()
 }
 status=`check docker`
 if [ "$status" = 0 ]; then
+	curl -fsSL https://get.docker.com | bash -s docker --mirror Aliyun
 	apt-get update
 	apt-get -y install apt-transport-https ca-certificates curl software-properties-common
 	curl -fsSL http://mirrors.aliyun.com/docker-ce/linux/ubuntu/gpg | sudo apt-key add -

+ 2 - 0
src/docker/build/dev/golang/Dockerfile

@@ -3,9 +3,11 @@ FROM docker.dever.cc/os/alpine:latest
 MAINTAINER Rabin "https://github.com/shemic"
 
 ENV GOPATH=/usr/local/golang
+ENV PATH=${PATH}:${GOPATH}/bin
 
 RUN apk add --no-cache --update go g++ git make
 RUN mkdir /src
 RUN mkdir /usr/local/golang
+RUN go get -u github.com/gpmgo/gopm
 
 VOLUME ["/src"]

+ 1 - 1
src/docker/build/dev/php/v7/Dockerfile

@@ -4,7 +4,7 @@ MAINTAINER Rabin "https://github.com/shemic"
 
 ENV COMPOSER_HOME=/share/lib/php
 
-RUN apk add --no-cache --update curl php7-fpm php7-pear php7-mysqli php7-session php7-pgsql php7-pdo_mysql php7-pdo_pgsql php7-gd php7-curl php7-mcrypt php7-json php7-zlib php7-xml php7-iconv php7-zip php7-phar  php7-openssl php7-dom php7-mbstring php7-simplexml php7-sockets php7-pcntl && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/bin/composer && apk del curl && composer config -g repo.packagist composer https://packagist.phpcomposer.com
+RUN apk add --no-cache --update curl php7-fpm php7-pear php7-mysqli php7-session php7-pgsql php7-pdo_mysql php7-pdo_pgsql php7-gd php7-curl php7-mcrypt php7-json php7-zlib php7-xml php7-xmlwriter php7-iconv php7-zip php7-phar  php7-openssl php7-dom php7-mbstring php7-simplexml php7-sockets php7-pcntl && curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/bin/composer && apk del curl && composer config -g repo.packagist composer https://packagist.phpcomposer.com
 
 #php7-memcached php7-redis 
 

+ 14 - 0
src/shell/docker/cleanlog

@@ -0,0 +1,14 @@
+#!/bin/sh  
+  
+echo "==================== start clean docker containers logs =========================="  
+  
+logs=$(find /var/lib/docker/containers/ -name *-json.log)  
+  
+for log in $logs  
+        do  
+                echo "clean logs : $log"  
+                cat /dev/null > $log  
+        done  
+  
+  
+echo "==================== end clean docker containers logs   =========================="