logstash-output-edge_loki 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7815895543bbcb18b5a4b9383f083223f229713c537f336f48cc2cffd76fed7
-  data.tar.gz: d8d68d9291a738b47d4de30ec1d3c2a62894aae498dfb6869e14684d4cbebb37
+  metadata.gz: a5ec89dff9f872d7371462dc0e39118ac9e0fa9d662fa5eecd4e99e9565f29d7
+  data.tar.gz: b598d411be65be2e16c9ce26d6d954cc63496085b714e66bc6274af6c42ef765
 SHA512:
-  metadata.gz: 4baf39cedf6a80af43190b002452d7565e1e1277de335aa708fd0533f76a527250ec90c420b1a643f7adf4c61d9dfe3216d9df4c10217aa926b126e703b504b1
-  data.tar.gz: 7fc3f6ad11def007015b2180ed15c663919babce9f36d5e69d1533751f2ebbf78325f8fb949c7f92c8cf90aadc072e428f478cbc8f8dc8c6e37592072f93aebe
+  metadata.gz: 8eef5ab0b6d08ab8968575e33cb60b88ecc6b45775df95c7abde04229bcc80577f394a976d4041bdd954772f598b67b94ce9da028c4f4ce32cd67a03bd5739da
+  data.tar.gz: b7f7529cc7d32de3e6c47a579f5db49595f2671d156660add48091ff4be26a83621ecb1196b3769854d7eae22ade1e0dbf4ad9bbd3008327a9c6fe83b0b6ee9f

data/lib/logstash/outputs/edge_loki.rb

@@ -15,9 +15,12 @@ class LogStash::Outputs::EDGE_Loki < LogStash::Outputs::Base
 
   ## 'A single instance of the Output will be shared among the pipeline worker threads'
   concurrency :single
+  
+  ## 'Loki Domain'
+  config :domain, :validate => :string, :required => true
 
-  ## 'Loki URL'
-  config :url, :validate => :string, :required => true
+  ## 'Loki Endpoint'
+  config :endpoint, :validate => :string, :required => true
 
   ## 'BasicAuth credentials'
   config :client_id, :validate => :string, :required => false
@@ -224,9 +227,10 @@ class LogStash::Outputs::EDGE_Loki < LogStash::Outputs::Base
 
   def send(batch)
     @logger.info("send: started method")
-    client = createClient()
+    token = createClient()
     payload = batch.to_json
-    res = loki_http_request(client, payload)
+    res = pensive_http_request(token, payload)
+    @logger.info("send result: ", res => res)
     if res.is_a?(Net::HTTPSuccess)
       @logger.debug("Successfully pushed data to loki")
     else
@@ -234,25 +238,38 @@ class LogStash::Outputs::EDGE_Loki < LogStash::Outputs::Base
     end
   end
 
-  def loki_http_request(client, payload)
+  def send1(batch)
+    @logger.info("send: started method")
+    token = createClient()
+    payload = batch.to_json
+    res = loki_http_request(token, payload)
+    if res.is_a?(Net::HTTPSuccess)
+      @logger.debug("Successfully pushed data to loki")
+    else
+      @logger.debug("failed payload", :payload => payload)
+    end
+  end
+
+  def loki_http_request(token, payload)
     @logger.info("loki_http_request: started method")
     req = Net::HTTP::Post.new(
       @uri.request_uri
     )
-    client.add_field('Content-Type', 'application/json')
-    client.add_field('X-Scope-OrgID', @tenant_id) if @tenant_id
-    client['User-Agent']= 'loki-logstash'
-    client.basic_auth(@client_id, @client_secret) if @client_id
-    client.body = payload
+    
+    req.add_field('Content-Type', 'application/json')
+    req.add_field('X-Scope-OrgID', @tenant_id) if @tenant_id
+    req['User-Agent']= 'loki-logstash'
+    req.basic_auth(@client_id, @client_secret) if @client_id
+    req.body = payload
 
     opts = ssl_opts(@uri)
 
-    @logger.debug("sending #{client.body.length} bytes to loki")
+    @logger.debug("sending #{req.body.length} bytes to loki")
     retry_count = 0
     delay = @min_delay
     begin
       res = Net::HTTP.start(@uri.host, @uri.port, **opts) { |http|
-        http.request(client)
+        http.request(req)
       }
       return res if !res.nil? && res.code.to_i != 429 && res.code.to_i.div(100) != 5
       raise StandardError.new res
@@ -276,11 +293,19 @@ class LogStash::Outputs::EDGE_Loki < LogStash::Outputs::Base
 
   def createClient
     @logger.info("createClient: started method")
-    client = OAuth2::Client.new(@client_id, @client_secret, site: @url)
+    client = OAuth2::Client.new(@client_id, @client_secret, site: @domain + @endpoint)
     client.auth_code.authorize_url(redirect_uri: @token_url)
+    token = client.auth_code.get_token(code, :redirect_uri => @token_url)
     @logger.info("createClient: started method", :client => client)
-    return client
+    return token
   end
 
+  def pensive_http_request(token, payload)
+    @logger.info("pensive_http_request: started method")
+    response = token.get(@endpoint, :headers => { 'Accept' => 'application/json', 'X-Scope-OrgID', @tenant_id }, :params => { page: 1 })
+    hash = JSON.parse(response.body)
+    @logger.info("pensive_http_request: ", :token_output => hash)
+    return hash
+  end
 end
 

data/logstash-output-edge_loki.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = 'logstash-output-edge_loki'
-  s.version = '1.0.7'
+  s.version = '1.0.8'
   s.authors = ['Britto Prabhu']
   s.email   = ['britto.prabhu@apmterminals.com']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-edge_loki
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Britto Prabhu