Skip to content
Permalink
Browse files

Merge #512

512: Prometheus integration with byron proxy r=disassembler a=disassembler



Co-authored-by: Andreas Triantafyllos <andreas.triantafyllos@iohk.io>
Co-authored-by: Samuel Leathers <samuel.leathers@iohk.io>
  • Loading branch information...
3 people committed May 15, 2019
2 parents 71d3a25 + a8250e2 commit f1781371533697fa84fcc3a72e52006373d2e208

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -9,13 +9,13 @@ packages: byron-proxy.cabal
source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
tag: b656651fd3c357860d8136598b223b048c195eae
tag: cbe7ab32354f3838dc8c95c64109904c8f503347
subdir: iohk-monitoring

source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
tag: b656651fd3c357860d8136598b223b048c195eae
tag: cbe7ab32354f3838dc8c95c64109904c8f503347
subdir: contra-tracer

--
@@ -0,0 +1,40 @@
# global filter; messages must have at least this severity to pass:
minSeverity: Debug

# these backends are initialized:
setupBackends:
- EKGViewBK
- KatipBK

# if not indicated otherwise, then messages are passed to these backends:
defaultBackends:
- EKGViewBK
- KatipBK

# if wanted, the GUI is listening on this port:
# hasGUI: 18321

# if wanted, the EKG interface is listening on this port:
hasEKG: 12789

# if wanted, the Prometheus interface is using this port:
hasPrometheus: 12799

# here we set up outputs of logging in 'katip':
setupScribes:
- scKind: StdoutSK
scFormat: ScText
scName: stdout

# if not indicated otherwise, then log output is directed to this:
defaultScribes:
- - StdoutSK
- stdout

# more options which can be passed as key-value pairs:
options:
mapSubtrace:
'#messagecounters.switchboard':
subtrace: NoTrace
'#messagecounters.ekgview':
subtrace: NoTrace
@@ -29,7 +29,8 @@ import qualified Pos.Chain.Block as CSL (Block, headerHash)

import Ouroboros.Network.Channel (Channel, socketAsChannel)
import qualified Ouroboros.Network.Server.Socket as Server
import Ouroboros.Network.Server.Version (Application (..), Dict (..), Version (..), Versions (..), Sigma (..))
import Ouroboros.Network.Protocol.Handshake.Version (Application (..), Dict (..), Version (..),
Versions (..), Sigma (..))
import Ouroboros.Network.Server.Version.Protocol (clientPeerFromVersions, serverPeerFromVersions)
import qualified Ouroboros.Network.Server.Version.CBOR as Version

@@ -219,12 +219,14 @@ defaultLoggerConfig = Monitoring.Representation
, Monitoring.setupBackends = [Monitoring.KatipBK]
, Monitoring.defaultBackends = [Monitoring.KatipBK]
, Monitoring.hasEKG = Nothing
, Monitoring.hasPrometheus = Nothing
, Monitoring.hasGUI = Nothing
, Monitoring.options = mempty
}
where
stdoutScribe = Monitoring.ScribeDefinition
{ Monitoring.scKind = Monitoring.StdoutSK
, Monitoring.scFormat = Monitoring.ScText
, Monitoring.scName = "stdout"
, Monitoring.scPrivacy = Monitoring.ScPublic
, Monitoring.scRotation = Nothing
@@ -21,13 +21,13 @@ source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
subdir: iohk-monitoring
tag: b656651fd3c357860d8136598b223b048c195eae
tag: cbe7ab32354f3838dc8c95c64109904c8f503347

source-repository-package
type: git
location: https://github.com/input-output-hk/iohk-monitoring-framework
subdir: contra-tracer
tag: b656651fd3c357860d8136598b223b048c195eae
tag: cbe7ab32354f3838dc8c95c64109904c8f503347

source-repository-package
type: git

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -39,6 +39,7 @@ let
packages.ouroboros-network.flags.cddl = true;
packages.ouroboros-network.components.tests.cddl.build-tools = [pkgs.cddl pkgs.cbor-diag];
packages.ouroboros-consensus.configureFlags = [ "--ghc-option=-Werror" ];
packages.prometheus.components.library.doExactConfig = true;
}
];
};
@@ -21,6 +21,7 @@ commonLib.pkgs.lib.mapAttrsRecursiveCond
"ouroboros-consensus"
"io-sim"
"io-sim-classes"
"byron-proxy"
];

# The set of jobs we consider crutial for each CI run.
@@ -67,6 +68,6 @@ commonLib.pkgs.lib.mapAttrsRecursiveCond
jobs.nix-tools.tests.io-sim.tests.x86_64-linux

jobs.nix-tools.exes.ouroboros-consensus.x86_64-linux
# jobs.nix-tools.exes.byron-proxy.x86_64-linux
jobs.nix-tools.exes.byron-proxy.x86_64-linux
];
} args)
@@ -16,7 +16,7 @@ extra-deps:
- graphviz-2999.20.0.3
- quickcheck-state-machine-0.6.0
- git: https://github.com/input-output-hk/iohk-monitoring-framework
commit: b656651fd3c357860d8136598b223b048c195eae
commit: cbe7ab32354f3838dc8c95c64109904c8f503347
subdirs:
- iohk-monitoring
- contra-tracer
@@ -12,7 +12,7 @@ packages:

extra-deps:
- git: https://github.com/input-output-hk/iohk-monitoring-framework
commit: b656651fd3c357860d8136598b223b048c195eae
commit: cbe7ab32354f3838dc8c95c64109904c8f503347
subdirs:
- iohk-monitoring
- contra-tracer
@@ -35,6 +35,9 @@ extra-deps:
- libyaml-0.1.0.0
- time-units-1.0.0
- ekg-json-0.1.0.6
- ekg-prometheus-adapter-0.1.0.4
- prometheus-2.1.1
- containers-0.5.11.0
- graphviz-2999.20.0.3@sha256:cde383c356bc41136ed53cd27e0800f46dbd2185600dd0de18d66d5c49739d94
- quickcheck-state-machine-0.6.0@sha256:3e4f8df0f6b5d415e3c8840dc75034a63e37f56f5f8cfa1035ded16345235ac4

@@ -100,6 +103,7 @@ extra-deps:
- writer-cps-transformers-0.5.6.0
- o-clock-1.0.0.1
- ekg-wai-0.1.0.3
- lzma-clib-5.2.2
# End of byron-proxy-induced dependencies.


0 comments on commit f178137

Please sign in to comment.
You can’t perform that action at this time.