Merge pull request #52 from checkr/zz/new-relic

Add new relic monitoring
openflagr · Oct 24, 2017 · a5db1f5 · a5db1f5
2 parents db56d3e + e4c853c
commit a5db1f5
Show file tree

Hide file tree

Showing 278 changed files with 20,747 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,9 +10,10 @@ ENV FLAGR_DB_DBDRIVER=sqlite3
 ENV FLAGR_DB_DBCONNECTIONSTR=/data/demo_sqlite3.db
 ENV FLAGR_RECORDER_ENABLED=false
 ENV HOST=0.0.0.0
+ENV PORT=18000
 
 RUN cd ./browser/flagr-ui/ && yarn install && yarn run build
 RUN make build
 
 EXPOSE 18000
-CMD make run
+CMD ./flagr
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -112,3 +112,11 @@
 [[constraint]]
   branch = "master"
   name = "github.com/meatballhat/negroni-logrus"
+
+[[constraint]]
+  name = "github.com/newrelic/go-agent"
+  version = "1.9.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/yadvendar/negroni-newrelic-go-agent"
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -16,10 +16,15 @@ var Config = struct {
 	DBDriver        string `env:"FLAGR_DB_DBDRIVER" envDefault:"mysql"`
 	DBConnectionStr string `env:"FLAGR_DB_DBCONNECTIONSTR" envDefault:"root:@tcp(127.0.0.1:18100)/flagr?parseTime=true"`
 
-	CORSEnabled   bool   `env:"FLAGR_CORS_ENABLED" envDefault:"true"`
+	CORSEnabled bool `env:"FLAGR_CORS_ENABLED" envDefault:"true"`
+
 	SentryEnabled bool   `env:"FLAGR_SENTRY_ENABLED" envDefault:"false"`
 	SentryDSN     string `env:"FLAGR_SENTRY_DSN" envDefault:""`
 
+	NewRelicEnabled bool   `env:"FLAGR_NEWRELIC_ENABLED" envDefault:"false"`
+	NewRelicAppName string `env:"FLAGR_NEWRELIC_NAME" envDefault:"flagr"`
+	NewRelicKey     string `env:"FLAGR_NEWRELIC_KEY" envDefault:""`
+
 	EvalCacheRefreshTimeout  time.Duration `env:"FLAGR_EVALCACHE_REFRESHTIMEOUT" envDefault:"59s"`
 	EvalCacheRefreshInterval time.Duration `env:"FLAGR_EVALCACHE_REFRESHINTERVAL" envDefault:"3s"`
 

diff --git a/swagger_gen/restapi/configure_flagr.go b/swagger_gen/restapi/configure_flagr.go
diff --git a/vendor/github.com/newrelic/go-agent/CHANGELOG.md b/vendor/github.com/newrelic/go-agent/CHANGELOG.md
diff --git a/vendor/github.com/newrelic/go-agent/CONTRIBUTING.md b/vendor/github.com/newrelic/go-agent/CONTRIBUTING.md