summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2018-08-02 17:30:45 +0200
committerGitHub <noreply@github.com>2018-08-02 17:30:45 +0200
commitbb148ee463b034117e4e695d61cab44f61388ce9 (patch)
tree1fa0e3528eac0615457085bc69478d95fc13312e
parenta31adbd4dffb0d5cc81763163f8a0437bbe45776 (diff)
downloadbugzilla-bb148ee463b034117e4e695d61cab44f61388ce9.tar.gz
bugzilla-bb148ee463b034117e4e695d61cab44f61388ce9.tar.xz
no bug - add dependencies needed for monitoring
-rw-r--r--.circleci/config.yml2
-rw-r--r--Dockerfile2
-rwxr-xr-xMakefile.PL16
3 files changed, 18 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index a70ea3ca6..a9a087609 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ version: 2
defaults:
bmo_slim_image: &bmo_slim_image
- image: mozillabteam/bmo-slim:20180523.1
+ image: mozillabteam/bmo-slim:20180801.2
user: app
mysql_image: &mysql_image
diff --git a/Dockerfile b/Dockerfile
index c86a92b0f..6426f1ad8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mozillabteam/bmo-slim:20180523.1
+FROM mozillabteam/bmo-slim:20180801.2
ARG CI
ARG CIRCLE_SHA1
diff --git a/Makefile.PL b/Makefile.PL
index 46228ab56..d9245c36f 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -362,6 +362,22 @@ my %optional_features = (
},
},
},
+ sentry => {
+ description => 'Sentry Support',
+ prereqs => {
+ runtime => {
+ requires => { 'Log::Log4perl::Appender::Raven' => '0.006' },
+ },
+ },
+ },
+ datadog => {
+ description => 'Data Dog support',
+ prereqs => {
+ runtime => {
+ requires => { 'DataDog::DogStatsd' => '0.05' },
+ },
+ },
+ },
);
for my $file ( glob 'extensions/*/Config.pm' ) {