git.iko.soy/typeable/control-logger
on master help sign in
drop more elasticsearch
971d3caVille Tirronen
control-logger.cabal−1
compare with master
unifiedsplit
@@ -33,7 +33,6 @@ library
33 , unordered-containers
33 , unordered-containers
34 if !impl(ghcjs)
34 if !impl(ghcjs)
35 build-depends: katip
35 build-depends: katip
36− , katip-elasticsearch
37 , optparse-applicative
36 , optparse-applicative
38 default-language: Haskell2010
37 default-language: Haskell2010
39 default-extensions: RankNTypes
38 default-extensions: RankNTypes
src/Control/Logger/Katip.hs−39
@@ -6,7 +6,6 @@ module Control.Logger.Katip
6 , KatipContextTState(..)
6 , KatipContextTState(..)
7 , getKatipLogger
7 , getKatipLogger
8 , ourFormatter
8 , ourFormatter
9− , ourMapping
10 , katipIndexNameString
9 , katipIndexNameString
11 , reopenableFileLog
10 , reopenableFileLog
12 ) where
11 ) where
@@ -18,15 +17,12 @@ import Control.Logger.Internal
18import Control.Logger.Katip.Scribes.Reopenable
17import Control.Logger.Katip.Scribes.Reopenable
19import Data.Aeson hiding (Error)
18import Data.Aeson hiding (Error)
20import qualified Data.HashMap.Strict as HM
19import qualified Data.HashMap.Strict as HM
21−import Data.Proxy as P
22import Data.Text (Text)
20import Data.Text (Text)
23import qualified Data.Text as T
21import qualified Data.Text as T
24import qualified Data.Text.Lazy.Builder as T.Builder
22import qualified Data.Text.Lazy.Builder as T.Builder
25import Katip as K hiding (logMsg)
23import Katip as K hiding (logMsg)
26import Katip.Core (ItemFunc(..), LocJs(..), ProcessIDJs(..))
24import Katip.Core (ItemFunc(..), LocJs(..), ProcessIDJs(..))
27import Katip.Monadic (KatipContextTState(..))
25import Katip.Monadic (KatipContextTState(..))
28−import Katip.Scribes.ElasticSearch
29−import Katip.Scribes.ElasticSearch.Internal as K
30
26
31
27
32logSeverityToKSeverity :: LogSeverity -> Severity
28logSeverityToKSeverity :: LogSeverity -> Severity
@@ -55,41 +51,6 @@ ourFormatter gitRev verb = ItemFunc $ \item -> go $ ourItemJson verb item
55 setRev :: HM.HashMap Text Value -> HM.HashMap Text Value
51 setRev :: HM.HashMap Text Value -> HM.HashMap Text Value
56 setRev = HM.insert "rev-hash" (toJSON gitRev)
52 setRev = HM.insert "rev-hash" (toJSON gitRev)
57
53
58−ourMapping :: K.MappingName ESV5 -> Value
59−ourMapping mn = object
60− [fromMappingName prx mn .= object ["properties" .= object prs]]
61− where
62− prs =
63− [ unanalyzedString "thread"
64− , unanalyzedString "sev"
65− , unanalyzedString "pid"
66− -- ns is frequently fulltext searched
67− , analyzedString "ns"
68− -- we want message to be fulltext searchable
69− , analyzedString "msg"
70− -- we want to group by the message as well
71− , unanalyzedString "msg-keyword"
72− -- we want to group by revision hash
73− , unanalyzedString "rev-hash"
74− , "loc" .= locType
75− , unanalyzedString "host"
76− , unanalyzedString "env"
77− , "at" .= dateType
78− , unanalyzedString "app"
79− ]
80− prx = P.Proxy :: P.Proxy ESV5
81− unanalyzedString k = k .= unanalyzedStringSpec prx
82− analyzedString k = k .= analyzedStringSpec prx
83− locType = object ["properties" .= object locPairs]
84− locPairs =
85− [ unanalyzedString "loc_pkg"
86− , unanalyzedString "loc_mod"
87− , unanalyzedString "loc_ln"
88− , unanalyzedString "loc_fn"
89− , unanalyzedString "loc_col"
90− ]
91− dateType = object ["format" .= esDateFormat, "type" .= String "date"]
92−
93katipIndexNameString :: Text
54katipIndexNameString :: Text
94katipIndexNameString = "antorica-b2b-logs"
55katipIndexNameString = "antorica-b2b-logs"
95
56
src/Control/Logger/Katip/Utils.hs−1
@@ -7,7 +7,6 @@ module Control.Logger.Katip.Utils
7 , registerFileScribe
7 , registerFileScribe
8 , setLoggingCtx
8 , setLoggingCtx
9 , ourFormatter
9 , ourFormatter
10− , ourMapping
11 , getKatipLogger
10 , getKatipLogger
12 , logSeverityToKSeverity
11 , logSeverityToKSeverity
13 ) where
12 ) where