log-elasticsearch 0.10.0.0 → 0.10.0.1

raw patch · 6 files changed

+33/−26 lines, 6 filessetup-changedPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• CHANGELOG.md +3/−0
• Setup.hs +0/−2
• log-elasticsearch.cabal +4/−3
• src/Log/Backend/ElasticSearch/V1.hs +2/−2
• src/Log/Backend/ElasticSearch/V5.hs +10/−10
• src/Log/Backend/ElasticSearch/V5/Internal.hs +14/−9

@@ -1,3 +1,6 @@+# log-elasticsearch-0.10.0.1 (2019-01-14)+* Compatibility with ES 6.x by using "text" instead of deprecated "string"+ # log-elasticsearch-0.10.0.0 (2018-03-28) * Expose `checkElasticSearchConnection` and `checkElasticSearchLogin`. * Add config parameters for number of shards and replicas to

@@ -1,2 +0,0 @@-import Distribution.Simple-main = defaultMain

@@ -1,5 +1,5 @@ name:                log-elasticsearch-version:             0.10.0.0+version:             0.10.0.1 synopsis:            Structured logging solution (Elasticsearch back end)  description:         Elasticsearch back end for the 'log' library suite.@@ -18,7 +18,8 @@ build-type:          Simple cabal-version:       >=1.10 extra-source-files:  CHANGELOG.md, README.md-tested-with:         GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.1+tested-with:         GHC == 7.10.3, GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4,+                     GHC == 8.6.2  Source-repository head   Type:     git@@ -40,7 +41,7 @@                        aeson-pretty >=0.8.2,                        bytestring,                        base64-bytestring,-                       bloodhound >= 0.13 && < 0.16,+                       bloodhound >= 0.13 && < 0.17,                        deepseq,                        http-client,                        http-client-tls,

@@ -274,7 +274,7 @@  -- | Check that login credentials are specified properly. ----- @since 0.10.1.0+-- @since 0.10.0.0 checkElasticSearchLogin :: ElasticSearchConfig -> IO (Either IOException ()) checkElasticSearchLogin ElasticSearchConfig{..} =   try $@@ -287,7 +287,7 @@  -- | Check that we can connect to the ES server. ----- @since 0.10.1.0+-- @since 0.10.0.0 checkElasticSearchConnection :: ElasticSearchConfig -> IO (Either HttpException ()) checkElasticSearchConnection esConf =     try (void $ runBH_ esConf listIndices)

@@ -218,16 +218,16 @@           , "format" .= ("date_time"::T.Text)           ]         , "domain" .= object [-            "type" .= ("string"::T.Text)+            "type" .= ("text"::T.Text)           ]         , "level" .= object [-            "type" .= ("string"::T.Text)+            "type" .= ("text"::T.Text)           ]         , "component" .= object [-            "type" .= ("string"::T.Text)+            "type" .= ("text"::T.Text)           ]         , "message" .= object [-            "type" .= ("string"::T.Text)+            "type" .= ("text"::T.Text)           ]         ]     ]@@ -246,16 +246,16 @@         , "format" .= ("date_time"::T.Text)         ]       , Aeson.pair "domain" $ Aeson.pairs $ mconcat-        [ "type" .= ("string"::T.Text)+        [ "type" .= ("text"::T.Text)         ]       , Aeson.pair "level" $ Aeson.pairs $ mconcat-        [ "type" .= ("string"::T.Text)+        [ "type" .= ("text"::T.Text)         ]       , Aeson.pair "component" $ Aeson.pairs $ mconcat-        [ "type" .= ("string"::T.Text)+        [ "type" .= ("text"::T.Text)         ]       , Aeson.pair "message" $ Aeson.pairs $ mconcat-        [ "type" .= ("string"::T.Text)+        [ "type" .= ("text"::T.Text)         ]       ]     ]@@ -274,7 +274,7 @@  -- | Check that login credentials are specified properly. ----- @since 0.10.1.0+-- @since 0.10.0.0 checkElasticSearchLogin :: ElasticSearchConfig -> IO (Either IOException ()) checkElasticSearchLogin ElasticSearchConfig{..} =   try $@@ -287,7 +287,7 @@  -- | Check that we can connect to the ES server. ----- @since 0.10.1.0+-- @since 0.10.0.0 checkElasticSearchConnection :: ElasticSearchConfig -> IO (Either HttpException ()) checkElasticSearchConnection esConf =     try (void $ runBH_ esConf listIndices)

@@ -15,15 +15,20 @@ data ElasticSearchConfig = ElasticSearchConfig {     esServer        :: !T.Text -- ^ Elasticsearch server address.   , esIndex         :: !T.Text -- ^ Elasticsearch index name.-  , esShardCount    :: !Int    -- ^ Elasticsearch shard count for the named index.-                               ---                               -- @since 0.10.0.0-  , esReplicaCount  :: !Int    -- ^ Elasticsearch replica count for the named index.-                               ---                               -- @since 0.10.0.0-  , esMapping       :: !T.Text -- ^ Elasticsearch mapping name.-  , esLogin         :: Maybe (EsUsername, EsPassword) -- ^ Elasticsearch basic authentication username and password.-  , esLoginInsecure :: !Bool   -- ^ Allow basic authentication over non-TLS connections.+  , esShardCount    :: !Int+    -- ^ Elasticsearch shard count for the named index.+    --+    -- @since 0.10.0.0+  , esReplicaCount  :: !Int+    -- ^ Elasticsearch replica count for the named index.+    --+    -- @since 0.10.0.0+  , esMapping       :: !T.Text+    -- ^ Elasticsearch mapping name.+  , esLogin         :: Maybe (EsUsername, EsPassword)+    -- ^ Elasticsearch basic authentication username and password.+  , esLoginInsecure :: !Bool+    -- ^ Allow basic authentication over non-TLS connections.   } deriving (Eq, Show)  -- | Sensible defaults for 'ElasticSearchConfig'.