git.iko.soy/typeable/katip
on master help sign in
Some package cleanup to get the full build working
7c6943aMichael Xavier
katip-datadog/LICENSEnew file+30
compare with master
unifiedsplit
@@ -0,0 +1,30 @@
1+Copyright (c) 2018, Soostone Inc
2+
3+All rights reserved.
4+
5+Redistribution and use in source and binary forms, with or without
6+modification, are permitted provided that the following conditions are met:
7+
8+ * Redistributions of source code must retain the above copyright
9+ notice, this list of conditions and the following disclaimer.
10+
11+ * Redistributions in binary form must reproduce the above
12+ copyright notice, this list of conditions and the following
13+ disclaimer in the documentation and/or other materials provided
14+ with the distribution.
15+
16+ * Neither the name of Ozgun Ataman nor the names of other
17+ contributors may be used to endorse or promote products derived
18+ from this software without specific prior written permission.
19+
20+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
katip-datadog/katip-datadog.cabal+2
@@ -33,6 +33,8 @@ library
33 build-depends:
33 build-depends:
34 --TODO: shed a lot of these
34 --TODO: shed a lot of these
35 base >=4.4.0.0 && <5
35 base >=4.4.0.0 && <5
36+ , aeson >= 1.0.0.0
37+ , bytestring
36 , katip >= 0.2.0.0 && < 0.8
38 , katip >= 0.2.0.0 && < 0.8
37 , text
39 , text
38 , connection
40 , connection
katip-datadog/src/Katip/Scribes/Datadog/TCP.hs+12−11
@@ -1,3 +1,4 @@
1+{-# LANGUAGE OverloadedStrings #-}
1-- | Creates a scribe as a Custom Forwarder for Datadog that sends log
2-- | Creates a scribe as a Custom Forwarder for Datadog that sends log
2-- messages over TCP via their TLS endpoint.
3-- messages over TCP via their TLS endpoint.
3module Katip.Scribes.Datadog.TCP
4module Katip.Scribes.Datadog.TCP
@@ -77,14 +78,14 @@ data DataDogScribeSettings = DataDogScribeSettings
77-- authentication.
78-- authentication.
78directAPIConnectionParams :: C.ConnectionParams
79directAPIConnectionParams :: C.ConnectionParams
79directAPIConnectionParams = C.ConnectionParams
80directAPIConnectionParams = C.ConnectionParams
80− { connectionHostname = "intake.logs.datadoghq.com"
81+ { C.connectionHostname = "intake.logs.datadoghq.com"
81− , connectionPort = 10516
82+ , C.connectionPort = 10516
82− , connectionUseSecure = Just $ C.TLSSettingsSimple
83+ , C.connectionUseSecure = Just $ C.TLSSettingsSimple
83− { settingDisableCertificateValidation = False
84+ { C.settingDisableCertificateValidation = False
84− , settingDisableSession = False
85+ , C.settingDisableSession = False
85− , settingUseServerName = False
86+ , C.settingUseServerName = False
86 }
87 }
87− , connectionUseSocks = Nothing
88+ , C.connectionUseSocks = Nothing
88 }
89 }
89
90
90
91
@@ -94,10 +95,10 @@ directAPIConnectionParams = C.ConnectionParams
94-- handled by the agent configuration.
95-- handled by the agent configuration.
95localAgentConnectionParams :: Net.PortNumber -> C.ConnectionParams
96localAgentConnectionParams :: Net.PortNumber -> C.ConnectionParams
96localAgentConnectionParams port = C.ConnectionParams
97localAgentConnectionParams port = C.ConnectionParams
97− { connectionHostname = "127.0.0.1"
98+ { C.connectionHostname = "127.0.0.1"
98− , connectionPort = port
99+ , C.connectionPort = port
99− , connectionUseSecure = Nothing
100+ , C.connectionUseSecure = Nothing
100− , connectionUseSocks = Nothing
101+ , C.connectionUseSocks = Nothing
101 }
102 }
102
103
103
104