Update prometheus/common and add support for --log.format

[kfdm]

I am not sure if I did this correctly, but I'm willing to accept guidance on how to format things properly. :)

This should handle --log.format for #1657

[simonpasquier]

LGTM. The order of imports in main.go isn't quite right. Although it isn't due to your PR it would be nice to fix it. The packages should be listed in 3 groups, each separated with a blank line:

import (
    // all stdlib packages

    // external packages

    // github.com/prometheus/alertmanager packages
)

[kfdm]

Ok, I'll take care of that tomorrow. :)

[kfdm]

Assuming that Prometheus is considered an external package from alertmanager's perspective, I believe I have grouped the packages as requested.

[simonpasquier]

Agreed, the problem exists in the current code base and isn't specific to your change. This group should be split into 2:

alertmanager/cmd/alertmanager/main.go

Lines 33 to 53 in f1d33fb

	"github.com/go-kit/kit/log"
	"github.com/go-kit/kit/log/level"
	apiv1 "github.com/prometheus/alertmanager/api/v1"
	apiv2 "github.com/prometheus/alertmanager/api/v2"
	"github.com/prometheus/alertmanager/cluster"
	"github.com/prometheus/alertmanager/config"
	"github.com/prometheus/alertmanager/dispatch"
	"github.com/prometheus/alertmanager/inhibit"
	"github.com/prometheus/alertmanager/nflog"
	"github.com/prometheus/alertmanager/notify"
	"github.com/prometheus/alertmanager/provider/mem"
	"github.com/prometheus/alertmanager/silence"
	"github.com/prometheus/alertmanager/template"
	"github.com/prometheus/alertmanager/types"
	"github.com/prometheus/alertmanager/ui"
	"github.com/prometheus/client_golang/prometheus"
	"github.com/prometheus/client_golang/prometheus/promhttp"
	"github.com/prometheus/common/promlog"
	"github.com/prometheus/common/route"
	"github.com/prometheus/common/version"
	"gopkg.in/alecthomas/kingpin.v2"

[kfdm]

I believe I have done that

alertmanager/cmd/alertmanager/main.go

Lines 17 to 55 in d1edbbc

	"context"
	"crypto/md5"
	"encoding/binary"
	"fmt"
	"net"
	"net/http"
	"net/url"
	"os"
	"os/signal"
	"path/filepath"
	"runtime"
	"strings"
	"sync"
	"syscall"
	"time"
	"github.com/go-kit/kit/log"
	"github.com/go-kit/kit/log/level"
	"github.com/prometheus/client_golang/prometheus"
	"github.com/prometheus/client_golang/prometheus/promhttp"
	"github.com/prometheus/common/promlog"
	promlogflag "github.com/prometheus/common/promlog/flag"
	"github.com/prometheus/common/route"
	"github.com/prometheus/common/version"
	"gopkg.in/alecthomas/kingpin.v2"
	apiv1 "github.com/prometheus/alertmanager/api/v1"
	apiv2 "github.com/prometheus/alertmanager/api/v2"
	"github.com/prometheus/alertmanager/cluster"
	"github.com/prometheus/alertmanager/config"
	"github.com/prometheus/alertmanager/dispatch"
	"github.com/prometheus/alertmanager/inhibit"
	"github.com/prometheus/alertmanager/nflog"
	"github.com/prometheus/alertmanager/notify"
	"github.com/prometheus/alertmanager/provider/mem"
	"github.com/prometheus/alertmanager/silence"
	"github.com/prometheus/alertmanager/template"
	"github.com/prometheus/alertmanager/types"
	"github.com/prometheus/alertmanager/ui"

though the line with promlogflag "github.com/prometheus/common/promlog/flag",
should that sort by the url part or sort to put it at the bottom (or top to match with api)?

[simonpasquier]

Ah sorry, I missed the latest update! All good then 👍

[mxinden]

Thanks for the patch!