Use flagext package from cortexproject

This also removes the dependency on grafana/dskit since it was only used
for its flagext package.

Fixes: #23

Signed-off-by: Charlie Le <[email protected]>

cmd/benchtool/main.go

@@ -8,9 +8,9 @@ import (
 	"os"
 	"os/signal"
 
+	"github.com/cortexproject/cortex/pkg/util/flagext"
 	logutil "github.com/cortexproject/cortex/pkg/util/log"
 	"github.com/go-kit/log/level"
-	"github.com/grafana/dskit/flagext"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/weaveworks/common/logging"

cmd/blockscopy/main.go

@@ -15,10 +15,10 @@ import (
 
 	"cloud.google.com/go/storage"
 	"github.com/cortexproject/cortex/pkg/storage/tsdb/bucketindex"
+	"github.com/cortexproject/cortex/pkg/util/flagext"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/concurrency"
-	"github.com/grafana/dskit/flagext"
 	"github.com/oklog/ulid"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"

cmd/e2ealerting/main.go

@@ -7,8 +7,8 @@ import (
 	"github.com/cortexproject/cortex-tools/pkg/alerting"
 	"github.com/go-kit/log/level"
 
+	"github.com/cortexproject/cortex/pkg/util/flagext"
 	util_log "github.com/cortexproject/cortex/pkg/util/log"
-	"github.com/grafana/dskit/flagext"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/weaveworks/common/logging"
 	"github.com/weaveworks/common/server"