logstash-output-edge_loki 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96ad0689fab60285dcec67ecf8af27c56491d6d6432df70615a4bf4e8a3b3772
-  data.tar.gz: 2ac60436522d4d133cb89b9af6fe67cc443092257fba60ad104cd3a2e3f613c4
+  metadata.gz: a5ec89dff9f872d7371462dc0e39118ac9e0fa9d662fa5eecd4e99e9565f29d7
+  data.tar.gz: b598d411be65be2e16c9ce26d6d954cc63496085b714e66bc6274af6c42ef765
 SHA512:
-  metadata.gz: e696333ac21b6b22cf62631eed79052ce05e0ec2febb69371c4827273124a4f7695becf05a9d9e843c33142ddf6518a8f4e69ff6e0c2bed51b42e8d00158ff1a
-  data.tar.gz: 89b9e6fe0e6a3acacd8db5ca993085aad0c52e8720ea5748ad031e920b611da7e4b0b4ad0e1b52bb68025e51964cee8fd8a026ebf57343e35cc50705bb0657c1
+  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")
-    createClient()
+    token = createClient()
     payload = batch.to_json
-    res = loki_http_request(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,11 +238,24 @@ class LogStash::Outputs::EDGE_Loki < LogStash::Outputs::Base
     end
   end
 
-  def loki_http_request(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
     )
+    
     req.add_field('Content-Type', 'application/json')
     req.add_field('X-Scope-OrgID', @tenant_id) if @tenant_id
     req['User-Agent']= 'loki-logstash'
@@ -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.6'
+  s.version = '1.0.8'
   s.authors = ['Britto Prabhu']
   s.email   = ['britto.prabhu@apmterminals.com']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-edge_loki
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Britto Prabhu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2023-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement