Merge pull request thanos-io#1 from utilitywarehouse/compact

Disable 2 week compaction
povilasv · Aug 14, 2018 · 422993c · 422993c
2 parents d068d53 + a7713a7
commit 422993c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -57,8 +57,8 @@ docker: build
 .PHONY: docker-push
 docker-push:
 	@echo ">> pushing image"
-	@docker tag "${DOCKER_IMAGE_NAME}" improbable/"$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)"
-	@docker push improbable/"$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)"
+	@docker tag "${DOCKER_IMAGE_NAME}" registry.uw.systems/telecom/"$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)"
+	@docker push registry.uw.systems/telecom/"$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)"
 
 # docs regenerates flags in docs for all thanos commands.
 .PHONY: docs

diff --git a/cmd/thanos/compact.go b/cmd/thanos/compact.go
@@ -106,8 +106,7 @@ func runCompact(
 			int64(1 * time.Hour / time.Millisecond),
 			int64(2 * time.Hour / time.Millisecond),
 			int64(8 * time.Hour / time.Millisecond),
-			int64(2 * 24 * time.Hour / time.Millisecond),  // 2 days
-			int64(14 * 24 * time.Hour / time.Millisecond), // 2 weeks
+			int64(2 * 24 * time.Hour / time.Millisecond), // 2 days
 		}, downsample.NewPool())
 		if err != nil {
 			return errors.Wrap(err, "create compactor")