Skip to content

Commit

Permalink
Remove graphite integration
Browse files Browse the repository at this point in the history
  • Loading branch information
Tamas Molnar committed Sep 18, 2018
1 parent d4d4260 commit 9f1eed8
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 102 deletions.
135 changes: 71 additions & 64 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
# go-tests = true
# unused-packages = true


[[constraint]]
name = "github.com/Financial-Times/base-ft-rw-app-go"
version = "1.0.2"

[[constraint]]
name = "github.com/Financial-Times/go-fthealth"
version = "0.4.0"
Expand Down
9 changes: 0 additions & 9 deletions helm/generic-rw-s3/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@ spec:
value: "{{ .Values.service.name }}"
- name: APP_PORT
value: "8080"
- name: GRAPHITE_ADDRESS
valueFrom:
configMapKeyRef:
name: global-config
key: graphite.address
- name: GRAPHITE_PREFIX
value: "coco.services.k8s.{{ .Values.service.name }}"
- name: AWS_REGION
valueFrom:
configMapKeyRef:
Expand All @@ -64,8 +57,6 @@ spec:
configMapKeyRef:
name: global-config
key: {{ .Values.bucket.key }}
- name: LOG_METRICS
value: "false"
- name: ONLY_UPDATES_ENABLED
value: "true"
{{ toYaml .Values.env | indent 8 }}
Expand Down
24 changes: 0 additions & 24 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"os"
"time"

"github.com/Financial-Times/base-ft-rw-app-go/baseftrwapp"
"github.com/Financial-Times/generic-rw-s3/service"
"github.com/Financial-Times/go-logger"
"github.com/Financial-Times/message-queue-gonsumer/consumer"
Expand Down Expand Up @@ -72,27 +71,6 @@ func main() {
EnvVar: "WORKERS",
})

graphiteTCPAddress := app.String(cli.StringOpt{
Name: "graphiteTCPAddress",
Value: "",
Desc: "Graphite TCP address, e.g. graphite.ft.com:2003. Leave as default if you do NOT want to output to graphite (e.g. if running locally",
EnvVar: "GRAPHITE_ADDRESS",
})

graphitePrefix := app.String(cli.StringOpt{
Name: "graphitePrefix",
Value: "",
Desc: "Prefix to use. Should start with content, include the environment, and the host name. e.g. coco.pre-prod.service-name.1 or content.test.people.rw.service-name.ftaps58938-law1a-eu-t",
EnvVar: "GRAPHITE_PREFIX",
})

logMetrics := app.Bool(cli.BoolOpt{
Name: "logMetrics",
Value: false,
Desc: "Whether to log metrics. Set to true if running locally and you want metrics output",
EnvVar: "LOG_METRICS",
})

sourceAddresses := app.Strings(cli.StringsOpt{
Name: "source-addresses",
Value: []string{},
Expand Down Expand Up @@ -149,8 +127,6 @@ func main() {
Topic: *sourceTopic,
ConcurrentProcessing: *sourceConcurrentProcessing,
}
baseftrwapp.OutputMetricsIfRequired(*graphiteTCPAddress, *graphitePrefix, *logMetrics)

runServer(*appName, *port, *resourcePath, *awsRegion, *bucketName, *bucketPrefix, *wrkSize, qConf, *onlyUpdatesEnabled, *requestLoggingEnabled)
}

Expand Down

0 comments on commit 9f1eed8

Please sign in to comment.