Authored by root

合并修改

@@ -41,6 +41,16 @@ search_lb: internal-java-inner-lb-464503140.cn-north-1.elb.amazonaws.com.cn. @@ -41,6 +41,16 @@ search_lb: internal-java-inner-lb-464503140.cn-north-1.elb.amazonaws.com.cn.
41 # rsyslog server 41 # rsyslog server
42 rsyslog_server: 172.31.9.252 42 rsyslog_server: 172.31.9.252
43 43
  44 +# ops influxdb server
  45 +ops_influxdb_server: 10.66.4.25
  46 +
  47 +# platform
  48 +platform_zk_gray: 172.31.70.42
  49 +platform_zk_pro: 172.31.70.42
  50 +platform_redis: 172.31.70.42
  51 +platform_gray: 172.31.70.42
  52 +
  53 +
44 #rabbit 54 #rabbit
45 rabbit: 55 rabbit:
46 common_local: 172.31.9.99 56 common_local: 172.31.9.99
@@ -40,6 +40,14 @@ search_lb: 10.66.4.112 @@ -40,6 +40,14 @@ search_lb: 10.66.4.112
40 # rsyslog server 40 # rsyslog server
41 rsyslog_server: 10.66.0.36 41 rsyslog_server: 10.66.0.36
42 42
  43 +# ops influxdb server
  44 +ops_influxdb_server: 10.66.4.25
  45 +
  46 +# platform
  47 +platform_zk_gray: 10.66.50.107
  48 +platform_zk_pro: 10.66.50.140
  49 +platform_redis: 10.66.50.132
  50 +platform_gray: 10.66.50.107
43 51
44 #rabbit 52 #rabbit
45 rabbit: 53 rabbit:
@@ -56,7 +56,7 @@ server { @@ -56,7 +56,7 @@ server {
56 #################### end match 2.yohobuy.com ######################### 56 #################### end match 2.yohobuy.com #########################
57 57
58 location / { 58 location / {
59 - limit_req zone=limit_ufo burst=10 nodelay; 59 + limit_req zone=limit_ufo burst=2 nodelay;
60 proxy_redirect off; 60 proxy_redirect off;
61 proxy_pass http://ufogateway/ufo-gateway/; 61 proxy_pass http://ufogateway/ufo-gateway/;
62 proxy_set_header X-Real-IP $real_ip; 62 proxy_set_header X-Real-IP $real_ip;
@@ -67,6 +67,15 @@ server { @@ -67,6 +67,15 @@ server {
67 proxy_set_header Host $host; 67 proxy_set_header Host $host;
68 } 68 }
69 69
  70 + location ^~ /mapp/ {
  71 + proxy_redirect off;
  72 + proxy_pass http://10.66.16.6/mapp/;
  73 + proxy_set_header Host "2.yohobuy.com";
  74 + proxy_set_header X-Real-IP $remote_addr;
  75 + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
  76 + proxy_set_header Accept-Encoding "gzip";
  77 + }
  78 +
70 79
71 location ~* .(txt)$ { 80 location ~* .(txt)$ {
72 root /Data/local/openresty-1.9.15.1/nginx/html; 81 root /Data/local/openresty-1.9.15.1/nginx/html;
@@ -22,10 +22,10 @@ $TTL 5 ; 5s default TTL @@ -22,10 +22,10 @@ $TTL 5 ; 5s default TTL
22 {% set CNAME = 'CNAME' %} 22 {% set CNAME = 'CNAME' %}
23 23
24 ;ops 24 ;ops
25 -influxdb IN A 10.66.4.25  
26 -influxdb-event IN A 10.66.4.25  
27 -influxdb-order IN A 10.66.4.25  
28 -monitor.redis IN A 10.66.4.25 25 +influxdb IN A {{ ops_influxdb_server }}
  26 +influxdb-event IN A {{ ops_influxdb_server }}
  27 +influxdb-order IN A {{ ops_influxdb_server }}
  28 +monitor.redis IN A {{ ops_influxdb_server }}
29 zabbix.master IN A 10.66.0.191 29 zabbix.master IN A 10.66.0.191
30 rsyslog IN A {{ rsyslog_server }} 30 rsyslog IN A {{ rsyslog_server }}
31 config.server IN A 10.66.80.2 31 config.server IN A 10.66.80.2
@@ -183,10 +183,10 @@ rabbitmq-erp-gray02 IN A 10.66.50.144 @@ -183,10 +183,10 @@ rabbitmq-erp-gray02 IN A 10.66.50.144
183 rabbitmq-erp01 IN A 10.66.50.87 183 rabbitmq-erp01 IN A 10.66.50.87
184 rabbitmq-erp02 IN A 10.66.50.100 184 rabbitmq-erp02 IN A 10.66.50.100
185 erp.influxdb IN A 10.66.50.10 185 erp.influxdb IN A 10.66.50.10
186 -zk.pro.platform IN A 10.66.50.140  
187 -zk.gray.platform IN A 10.66.50.107  
188 -redis.platform IN A 10.66.50.132  
189 -apigray.platform IN A 10.66.50.107 186 +zk.pro.platform IN A {{ platform_zk_pro }}
  187 +zk.gray.platform IN A {{ platform_zk_gray }}
  188 +redis.platform IN A {{ platform_redis }}
  189 +apigray.platform IN A {{ platform_gray }}
190 api.platform IN A 10.66.50.140 190 api.platform IN A 10.66.50.140
191 serve.erp IN A 10.66.50.7 191 serve.erp IN A 10.66.50.7
192 read.erporders IN A 10.66.50.135 192 read.erporders IN A 10.66.50.135
1 -{  
2 - "lb-75axowvj": {  
3 - "domain":"search.yohoops.org",  
4 - "mappings": {  
5 - "search-service-az1": 10  
6 - }  
7 - },  
8 - "lb-l9wzc6iv": {  
9 - "domain":"search.yohoops.org",  
10 - "mappings": {  
11 - "search-service-az1": 10  
12 - }  
13 - }  
14 -}  
1 -{  
2 - "lb-75axowvj": {  
3 - "domain":"search.yohoops.org",  
4 - "mappings": {  
5 - "search-service-az2": 10  
6 - }  
7 - },  
8 - "lb-l9wzc6iv": {  
9 - "domain":"search.yohoops.org",  
10 - "mappings": {  
11 - "search-service-az2": 10  
12 - }  
13 - }  
14 -}  
1 -{  
2 - "lb-75axowvj": {  
3 - "domain":"search.yohoops.org",  
4 - "mappings": {  
5 - "search-service-az1": 10  
6 - }  
7 - }  
8 -}  
1 -{  
2 - "lb-75axowvj": {  
3 - "domain":"search.yohoops.org",  
4 - "mappings": {  
5 - "search-service-az2": 10  
6 - }  
7 - }  
8 -}  
1 -{  
2 - "lb-l9wzc6iv": {  
3 - "domain":"search.yohoops.org",  
4 - "mappings": {  
5 - "search-service-az1": 10  
6 - }  
7 - }  
8 -}  
1 -{  
2 - "lb-l9wzc6iv": {  
3 - "domain":"search.yohoops.org",  
4 - "mappings": {  
5 - "search-service-az2": 10  
6 - }  
7 - }  
8 -}