hriemann 0.3.3.3 → 0.3.3.4
raw patch · 2 files changed
+17/−27 lines, 2 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
- Network.Monitoring.Riemann.Json: instance Data.Aeson.Types.FromJSON.FromJSON Text.ProtocolBuffers.Basic.Utf8
- Network.Monitoring.Riemann.Json: instance Data.Aeson.Types.ToJSON.ToJSON Text.ProtocolBuffers.Basic.Utf8
- Network.Monitoring.Riemann.BatchClient: BatchClient :: (InChan LogCommand) -> BatchClient
+ Network.Monitoring.Riemann.BatchClient: BatchClient :: InChan LogCommand -> BatchClient
- Network.Monitoring.Riemann.BatchClient: BatchClientNoBuffer :: (Queue LogCommand) -> BatchClientNoBuffer
+ Network.Monitoring.Riemann.BatchClient: BatchClientNoBuffer :: Queue LogCommand -> BatchClientNoBuffer
- Network.Monitoring.Riemann.BatchClient: Stop :: (MVar ()) -> LogCommand
+ Network.Monitoring.Riemann.BatchClient: Stop :: MVar () -> LogCommand
- Network.Monitoring.Riemann.Event: metric :: (Metric a) => a -> Event -> Event
+ Network.Monitoring.Riemann.Event: metric :: Metric a => a -> Event -> Event
- Network.Monitoring.Riemann.Event.Monoid: metric :: (Metric a) => a -> Endo Event
+ Network.Monitoring.Riemann.Event.Monoid: metric :: Metric a => a -> Endo Event
- Network.Monitoring.Riemann.Proto.Attribute: Attribute :: !Utf8 -> !(Maybe Utf8) -> Attribute
+ Network.Monitoring.Riemann.Proto.Attribute: Attribute :: !Utf8 -> !Maybe Utf8 -> Attribute
- Network.Monitoring.Riemann.Proto.Attribute: [value] :: Attribute -> !(Maybe Utf8)
+ Network.Monitoring.Riemann.Proto.Attribute: [value] :: Attribute -> !Maybe Utf8
- Network.Monitoring.Riemann.Proto.Event: Event :: !(Maybe Int64) -> !(Maybe Utf8) -> !(Maybe Utf8) -> !(Maybe Utf8) -> !(Maybe Utf8) -> !(Seq Utf8) -> !(Maybe Float) -> !(Seq Attribute) -> !(Maybe Int64) -> !(Maybe Double) -> !(Maybe Float) -> Event
+ Network.Monitoring.Riemann.Proto.Event: Event :: !Maybe Int64 -> !Maybe Utf8 -> !Maybe Utf8 -> !Maybe Utf8 -> !Maybe Utf8 -> !Seq Utf8 -> !Maybe Float -> !Seq Attribute -> !Maybe Int64 -> !Maybe Double -> !Maybe Float -> Event
- Network.Monitoring.Riemann.Proto.Event: [attributes] :: Event -> !(Seq Attribute)
+ Network.Monitoring.Riemann.Proto.Event: [attributes] :: Event -> !Seq Attribute
- Network.Monitoring.Riemann.Proto.Event: [description] :: Event -> !(Maybe Utf8)
+ Network.Monitoring.Riemann.Proto.Event: [description] :: Event -> !Maybe Utf8
- Network.Monitoring.Riemann.Proto.Event: [host] :: Event -> !(Maybe Utf8)
+ Network.Monitoring.Riemann.Proto.Event: [host] :: Event -> !Maybe Utf8
- Network.Monitoring.Riemann.Proto.Event: [metric_d] :: Event -> !(Maybe Double)
+ Network.Monitoring.Riemann.Proto.Event: [metric_d] :: Event -> !Maybe Double
- Network.Monitoring.Riemann.Proto.Event: [metric_f] :: Event -> !(Maybe Float)
+ Network.Monitoring.Riemann.Proto.Event: [metric_f] :: Event -> !Maybe Float
- Network.Monitoring.Riemann.Proto.Event: [metric_sint64] :: Event -> !(Maybe Int64)
+ Network.Monitoring.Riemann.Proto.Event: [metric_sint64] :: Event -> !Maybe Int64
- Network.Monitoring.Riemann.Proto.Event: [service] :: Event -> !(Maybe Utf8)
+ Network.Monitoring.Riemann.Proto.Event: [service] :: Event -> !Maybe Utf8
- Network.Monitoring.Riemann.Proto.Event: [state] :: Event -> !(Maybe Utf8)
+ Network.Monitoring.Riemann.Proto.Event: [state] :: Event -> !Maybe Utf8
- Network.Monitoring.Riemann.Proto.Event: [tags] :: Event -> !(Seq Utf8)
+ Network.Monitoring.Riemann.Proto.Event: [tags] :: Event -> !Seq Utf8
- Network.Monitoring.Riemann.Proto.Event: [time] :: Event -> !(Maybe Int64)
+ Network.Monitoring.Riemann.Proto.Event: [time] :: Event -> !Maybe Int64
- Network.Monitoring.Riemann.Proto.Event: [ttl] :: Event -> !(Maybe Float)
+ Network.Monitoring.Riemann.Proto.Event: [ttl] :: Event -> !Maybe Float
- Network.Monitoring.Riemann.Proto.Msg: Msg :: !(Maybe Bool) -> !(Maybe Utf8) -> !(Seq State) -> !(Maybe Query) -> !(Seq Event) -> Msg
+ Network.Monitoring.Riemann.Proto.Msg: Msg :: !Maybe Bool -> !Maybe Utf8 -> !Seq State -> !Maybe Query -> !Seq Event -> Msg
- Network.Monitoring.Riemann.Proto.Msg: [error] :: Msg -> !(Maybe Utf8)
+ Network.Monitoring.Riemann.Proto.Msg: [error] :: Msg -> !Maybe Utf8
- Network.Monitoring.Riemann.Proto.Msg: [events] :: Msg -> !(Seq Event)
+ Network.Monitoring.Riemann.Proto.Msg: [events] :: Msg -> !Seq Event
- Network.Monitoring.Riemann.Proto.Msg: [ok] :: Msg -> !(Maybe Bool)
+ Network.Monitoring.Riemann.Proto.Msg: [ok] :: Msg -> !Maybe Bool
- Network.Monitoring.Riemann.Proto.Msg: [query] :: Msg -> !(Maybe Query)
+ Network.Monitoring.Riemann.Proto.Msg: [query] :: Msg -> !Maybe Query
- Network.Monitoring.Riemann.Proto.Msg: [states] :: Msg -> !(Seq State)
+ Network.Monitoring.Riemann.Proto.Msg: [states] :: Msg -> !Seq State
- Network.Monitoring.Riemann.Proto.State: State :: !(Maybe Int64) -> !(Maybe Utf8) -> !(Maybe Utf8) -> !(Maybe Utf8) -> !(Maybe Utf8) -> !(Maybe Bool) -> !(Seq Utf8) -> !(Maybe Float) -> State
+ Network.Monitoring.Riemann.Proto.State: State :: !Maybe Int64 -> !Maybe Utf8 -> !Maybe Utf8 -> !Maybe Utf8 -> !Maybe Utf8 -> !Maybe Bool -> !Seq Utf8 -> !Maybe Float -> State
- Network.Monitoring.Riemann.Proto.State: [description] :: State -> !(Maybe Utf8)
+ Network.Monitoring.Riemann.Proto.State: [description] :: State -> !Maybe Utf8
- Network.Monitoring.Riemann.Proto.State: [host] :: State -> !(Maybe Utf8)
+ Network.Monitoring.Riemann.Proto.State: [host] :: State -> !Maybe Utf8
- Network.Monitoring.Riemann.Proto.State: [once] :: State -> !(Maybe Bool)
+ Network.Monitoring.Riemann.Proto.State: [once] :: State -> !Maybe Bool
- Network.Monitoring.Riemann.Proto.State: [service] :: State -> !(Maybe Utf8)
+ Network.Monitoring.Riemann.Proto.State: [service] :: State -> !Maybe Utf8
- Network.Monitoring.Riemann.Proto.State: [state] :: State -> !(Maybe Utf8)
+ Network.Monitoring.Riemann.Proto.State: [state] :: State -> !Maybe Utf8
- Network.Monitoring.Riemann.Proto.State: [tags] :: State -> !(Seq Utf8)
+ Network.Monitoring.Riemann.Proto.State: [tags] :: State -> !Seq Utf8
- Network.Monitoring.Riemann.Proto.State: [time] :: State -> !(Maybe Int64)
+ Network.Monitoring.Riemann.Proto.State: [time] :: State -> !Maybe Int64
- Network.Monitoring.Riemann.Proto.State: [ttl] :: State -> !(Maybe Float)
+ Network.Monitoring.Riemann.Proto.State: [ttl] :: State -> !Maybe Float
Files
- hriemann.cabal +5/−4
- src/Network/Monitoring/Riemann/Json.hs +12/−23
hriemann.cabal view
@@ -1,11 +1,13 @@--- This file has been generated from package.yaml by hpack version 0.28.2.+cabal-version: 1.12++-- This file has been generated from package.yaml by hpack version 0.33.0. -- -- see: https://github.com/sol/hpack ----- hash: ed0b77d5a3a65f31bc36787567f5c85d79d377531c21b752f395a62f27f71a53+-- hash: 2947d7e33a64a743d8f7eb7a408e33dd35a16872749482aa16d4072cfb0fd274 name: hriemann-version: 0.3.3.3+version: 0.3.3.4 synopsis: A Riemann Client for Haskell description: A Riemann Client for Haskell category: Monitoring@@ -17,7 +19,6 @@ license: MIT license-file: LICENSE build-type: Simple-cabal-version: >= 1.10 source-repository head type: git
src/Network/Monitoring/Riemann/Json.hs view
@@ -1,39 +1,28 @@ {-# LANGUAGE OverloadedLists #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-}-{-# OPTIONS_GHC -fno-warn-orphans #-} {-# OPTIONS_GHC -fno-warn-missing-import-lists #-}+{-# OPTIONS_GHC -fno-warn-orphans #-} module Network.Monitoring.Riemann.Json where import Control.Applicative ((<|>)) import Data.Aeson- ( FromJSON- , ToJSON- , Value(String)- , (.!=)- , (.:)- , (.:?)- , parseJSON- , toJSON- , withObject- , withText+ ( FromJSON,+ ToJSON,+ parseJSON,+ withObject,+ (.!=),+ (.:),+ (.:?), ) import Data.Scientific (toBoundedInteger, toBoundedRealFloat)-import qualified Data.Text as Text import Network.Monitoring.Riemann.Proto.Attribute (Attribute)-import Network.Monitoring.Riemann.Proto.Event (Event(..))-import Network.Monitoring.Riemann.Proto.Msg (Msg(..))-import Network.Monitoring.Riemann.Proto.Query (Query(..))-import Network.Monitoring.Riemann.Proto.State (State(..))+import Network.Monitoring.Riemann.Proto.Event (Event (..))+import Network.Monitoring.Riemann.Proto.Msg (Msg (..))+import Network.Monitoring.Riemann.Proto.Query (Query (..))+import Network.Monitoring.Riemann.Proto.State (State (..)) import Prelude hiding (error)-import qualified Text.ProtocolBuffers.Header as P'--instance ToJSON P'.Utf8 where- toJSON v = String (Text.pack (P'.uToString v))--instance FromJSON P'.Utf8 where- parseJSON = withText "Utf8 String" $ pure . P'.uFromString . Text.unpack instance ToJSON Attribute