diff --git a/.gitignore b/.gitignore index fa19e01d509ccd80cd1f42a00da3993f60245ee7..cdce78c5fe3a2c389fcd5708e749ca9b27c58551 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ Module.symvers modules.builtin modules.order /out +sync.sh \ No newline at end of file diff --git a/source/tools/monitor/unity/common/addition.lua b/source/tools/monitor/unity/common/addition.lua new file mode 100644 index 0000000000000000000000000000000000000000..e8a98515a72dccdd69a4d238dd891e45fd11b304 Binary files /dev/null and b/source/tools/monitor/unity/common/addition.lua differ diff --git a/source/tools/monitor/unity/httplib/coMetrics.lua b/source/tools/monitor/unity/httplib/coMetrics.lua index eaf97761fb5389ed270b0d22897507b0a59712da..510cd54e310df92198253c053524c621d1054dc4 100644 --- a/source/tools/monitor/unity/httplib/coMetrics.lua +++ b/source/tools/monitor/unity/httplib/coMetrics.lua @@ -12,7 +12,7 @@ local pystring = require("common.pystring") local lineParse = require("common.lineParse") local CtransPro = require("common.transPro") local base64 = require("base64") - +local addition = require("common.addition") local CcoMetrics = class("coMetrics", CcoHttpCliInst) @@ -27,8 +27,9 @@ function CcoMetrics:_init_(fYaml) local inst = Cidentity.new(fYaml) local instance = inst:id() - self._ak = res.pushTo.ak - self._sk = res.pushTo.sk + local _addition = res.pushTo.addition + + self._key1, self._key2 = addition:decode(_addition) self._project = res.pushTo.project self._endpoint = res.pushTo.endpoint self._metricstore = res.pushTo.metricstore @@ -76,32 +77,21 @@ function CcoMetrics:trans(msgs) local data_len = self.awesome.metricSnappy(prome,byte_ptr) data_len = tonumber(data_len) local data = self.ffi.cast("GoUint8*", byte_ptr.data) - --local stream = "" - --for i = 0, data_len do - -- --print(data[i]) - -- - -- stream = stream .. string.char(data[i]) - --end - -- - --print(stream) - --return stream return self.foxffi.string(data, data_len) - --return "sysak_proc_cpu_total{mode=\"user\",instance=\"i-wz9d3tqjhpb8esj8ps4z\"} 0.8\nsysak_proc_cpu_total{mode=\"total\",instance=\"i-wz9d3tqjhpb8esj8ps4z\"} 3960.0\nsysak_proc_cpu_total{mode=\"user2\",instance=\"i-wz9d3tqjhpb8iesj8ps4z\"} 0.9\n" end function CcoMetrics:pack(body) local line = self:packCliHead('POST', self._url) - local aksk = self._ak .. ":"..self._sk - local aksk64 = base64.encode(aksk) - print(aksk64) + local keys = self._key1 .. ":"..self._key2 + local keys64 = base64.encode(keys) local head = { Host = self._host, ["Content-Encoding"] = "snappy", ["Content-Type"] = "application/x-protobuf", --["X-Prometheus-Remote-Write-Version"] = "0.1.0", ["Content-Length"] = #body, - ["Authorization"] = "Basic " .. aksk64, + ["Authorization"] = "Basic " .. keys64, } local heads = self:packCliHeaders(head) print("pack finish")