update rename lua-influxdb-relay

Author: kwanhur

README.md

@@ -1,4 +1,4 @@
-# lua-resty-influxdb-relay
+# lua-influxdb-relay
 A Lua resty service to replicate InfluxDB data for high availability
 
 Table of Contents
@@ -19,27 +19,19 @@ Synopsis
 ========
 ```lua
     # --------- copy relay configuration file -----------
-    cp -av /path/to/lua-resty-influxdb-relay/lib/relay/lua-resty-influxdb-relay.ini.demo /tmp/lua-resty-influxdb-relay.ini
+    cp -av /path/to/lua-influxdb-relay/lib/relay/lua-influxdb-relay.ini.demo /tmp/lua-influxdb-relay.ini
 
     # --------- relay config begin --------------
     	lua_code_cache on;
-    	lua_package_path "/path/to/openresty/lualib/?.lua;/path/to/lua-resty-influxdb-relay/lib/?.lua;;";
+    	lua_package_path "/path/to/openresty/lualib/?.lua;/path/to/lua-influxdb-relay/lib/?.lua;;";
     	lua_package_cpath "/path/to/openresty/lualib/?.so;;";
     	lua_shared_dict relay 1m;
-    	init_by_lua_file '/path/to/lua-resty-influxdb-relay/lib/relay/init.lua';
+    	init_by_lua_file '/path/to/lua-influxdb-relay/lib/relay/init.lua';
     # --------- relay config end ----------------
 
-    upstream backend_master {
-      server 127.0.0.1: 8086;
-    }
-    
-    upstream backend_slave {
-      server 127.0.0.1: 18086;
-    }
-    
-    upstream backend_relay {
-      server 127.0.0.1: 8086;
-      server 127.0.0.1: 18086;
+    upstream backend_query {
+      server 127.0.0.1:8086;
+      server 127.0.0.1:8087;
     }
 
     server {
@@ -48,44 +40,44 @@ Synopsis
 
       location = /write {
         set $backend_uri_args '';
-        rewrite_by_lua_file '/path/to/lua-resty-influxdb-relay/lib/relay/rewrite.lua';
+        rewrite_by_lua_file '/path/to/lua-influxdb-relay/lib/relay/rewrite.lua';
       }
 
       location = /query {
-        proxy_pass http://backend_relay;
+        proxy_pass http://backend_query;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header Connection "";
         proxy_http_version 1.1;
 
-        rewrite_by_lua_file '/path/to/lua-resty-influxdb-relay/lib/relay/rewrite_query.lua';
+        rewrite_by_lua_file '/path/to/lua-influxdb-relay/lib/relay/rewrite_query.lua';
       }
 
-      location = /relay_master {
+      location = /relay1 {
         internal;
 
-        proxy_pass http://backend_master;
+        proxy_pass http://127.0.0.1:8086;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header Connection "";
         proxy_http_version 1.1;
 
-        rewrite_by_lua_file '/path/to/lua-resty-influxdb-relay/lib/relay/rewrite_relay.lua';
+        rewrite_by_lua_file '/path/to/lua-influxdb-relay/lib/relay/rewrite_relay.lua';
       }
 
-      location = /relay_slave {
+      location = /relay2 {
         internal;
 
-        proxy_pass http://backend_slave;
+        proxy_pass http://127.0.0.1:8087;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header Connection "";
         proxy_http_version 1.1;
 
-        rewrite_by_lua_file '/path/to/lua-resty-influxdb-relay/lib/relay/rewrite_relay.lua';
+        rewrite_by_lua_file '/path/to/lua-influxdb-relay/lib/relay/rewrite_relay.lua';
       }
 
     }
@@ -96,7 +88,7 @@ Synopsis
 Installation
 ============
 
-lua-resty-influxdb-relay use [lua-resty-ini](https://github.com/doujiang24/lua-resty-ini) to parse the ini configuration.
+lua-influxdb-relay use [lua-resty-ini](https://github.com/doujiang24/lua-resty-ini) to parse the ini configuration.
 And you should install it with [opm](https://github.com/openresty/opm#readme) just like that: opm install doujiang24/lua-resty-ini
 
 [Back to TOC](#table-of-contents)

example/conf/nginx.conf

@@ -24,11 +24,11 @@ http {
 
 # --------- relay config begin --------------
 	lua_code_cache on;
-	lua_package_path "/usr/local/openresty/lualib/?.lua;/path/to/lua-resty-influxdb-relay/lib/?.lua;;";
+	lua_package_path "/usr/local/openresty/lualib/?.lua;/path/to/luay-influxdb-relay/lib/?.lua;;";
 	lua_package_cpath "/usr/local/openresty/lualib/?.so;;";
 	lua_need_request_body on;
 	lua_shared_dict relay 1m;
-	init_by_lua_file '/path/to/lua-resty-influxdb-relay/lib/relay/init.lua';
+	init_by_lua_file '/path/to/lua-influxdb-relay/lib/relay/init.lua';
 
 # --------- relay config end ----------------
 	include vhosts/influxdb-relay.conf;

example/conf/vhosts/influxdb-relay.conf

@@ -1,11 +1,3 @@
-upstream backend_master {
-  server 127.0.0.1: 8086;
-}
-
-upstream backend_slave {
-  server 127.0.0.1: 18086;
-}
-
 upstream backend_relay {
   server 127.0.0.1: 8086;
   server 127.0.0.1: 18086;
@@ -20,7 +12,7 @@ server {
 
   location = /write {
     set $backend_uri_args '';
-    rewrite_by_lua_file '/path/to/lua-resty-influxdb-relay/lib/relay/rewrite.lua';
+    rewrite_by_lua_file '/path/to/lua-influxdb-relay/lib/relay/rewrite.lua';
   }
 
   location = /query {
@@ -30,11 +22,13 @@ server {
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header Connection "";
     proxy_http_version 1.1;
-    rewrite_by_lua_file '/path/to/lua-resty-influxdb-relay/lib/relay/rewrite_query.lua';
+    rewrite_by_lua_file '/path/to/lua-influxdb-relay/lib/relay/rewrite_query.lua';
   }
 
   location = /relay_master {
-    proxy_pass http://backend_master;
+    internal;
+
+    proxy_pass http://127.0.0.1:8086;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_set_header X-Real-IP $remote_addr;
@@ -44,7 +38,9 @@ server {
   }
 
   location = /relay_slave {
-    proxy_pass http://backend_slave;
+    internal;
+
+    proxy_pass http://127.0.0.1:8087;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_set_header X-Real-IP $remote_addr;

lib/relay/init.lua

@@ -5,7 +5,7 @@
 local ini = require("resty.ini")
 local stringUtil = require("relay.utils.strings")
 
-local configPath = '/tmp/lua-resty-influxdb-relay.ini'
+local configPath = '/tmp/lua-influxdb-relay.ini'
 
 local relayURIKey = 'relay:uri'
 local relayWriteURIKey = 'relay:write:uri'

lib/relay/lua-resty-influxdb-relay.ini.demo lib/relay/lua-influxdb-relay.ini.demo

@@ -1,4 +1,4 @@
 [relay]
-relayURI = /relay_master,/relay_slave
+relayURI = /relay1,/relay2
 relayWriteURI = /write
 relayAction = CREATE,ALTER,DROP