diff --git a/go.mod b/go.mod index f06e6badc46..1955da515ac 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( cloud.google.com/go/storage v1.13.0 github.com/BurntSushi/toml v0.3.1 github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f + github.com/afiskon/promtail-client v0.0.0-20190305142237-506f3f921e9c // indirect github.com/aws/aws-sdk-go v1.37.20 github.com/beevik/etree v1.1.0 github.com/benbjohnson/clock v0.0.0-20161215174838-7dc76406b6d3 diff --git a/go.sum b/go.sum index e1000243f0e..5fd43983d35 100644 --- a/go.sum +++ b/go.sum @@ -129,6 +129,8 @@ github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/ github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f h1:HR5nRmUQgXrwqZOwZ2DAc/aCi3Bu3xENpspW935vxu0= github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f/go.mod h1:f3HiCrHjHBdcm6E83vGaXh1KomZMA2P6aeo3hKx/wg0= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= +github.com/afiskon/promtail-client v0.0.0-20190305142237-506f3f921e9c h1:AMDVOKGaiqse4qiRXSzRgpC9DCNTHCx6zpzdtXXrKM4= +github.com/afiskon/promtail-client v0.0.0-20190305142237-506f3f921e9c/go.mod h1:p/7Wos+jcfrnwLqqzJMZ0s323kfVtJPW+HUvAANklVQ= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= diff --git a/public/app/plugins/datasource/loki/components/LokiLabel.tsx b/public/app/plugins/datasource/loki/components/LokiLabel.tsx index bce2302a93c..8acb986d56a 100644 --- a/public/app/plugins/datasource/loki/components/LokiLabel.tsx +++ b/public/app/plugins/datasource/loki/components/LokiLabel.tsx @@ -68,7 +68,7 @@ const getLabelStyles = (theme: GrafanaTheme) => ({ cursor: pointer; font-size: ${theme.typography.size.sm}; line-height: ${theme.typography.lineHeight.xs}; - border: 1px solid ${theme.colors.border2}; + background-color: ${theme.colors.bg3}; vertical-align: baseline; color: ${theme.colors.text}; white-space: nowrap; @@ -77,8 +77,6 @@ const getLabelStyles = (theme: GrafanaTheme) => ({ border-radius: ${theme.border.radius.md}; margin-right: ${theme.spacing.sm}; margin-bottom: ${theme.spacing.xs}; - text-overflow: ellipsis; - overflow: hidden; `, loading: css` font-weight: ${theme.typography.weight.semibold}; diff --git a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx index 82471502333..b016aed29ee 100644 --- a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx +++ b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx @@ -92,6 +92,7 @@ const getStyles = stylesFactory((theme: GrafanaTheme) => ({ wrapper: css` background-color: ${theme.colors.bg2}; padding: ${theme.spacing.md}; + width: 100%; `, list: css` margin-top: ${theme.spacing.sm}; @@ -130,18 +131,14 @@ const getStyles = stylesFactory((theme: GrafanaTheme) => ({ error: css` color: ${theme.palette.brandDanger}; `, - valueCell: css` - overflow: hidden; - text-overflow: ellipsis; - `, + valueCell: css``, valueList: css` margin-right: ${theme.spacing.sm}; `, valueListWrapper: css` - padding: ${theme.spacing.sm}; - & + & { - border-left: 1px solid ${theme.colors.border2}; - } + border-left: 1px solid ${theme.colors.border2}; + margin: ${theme.spacing.sm} 0; + padding: ${theme.spacing.sm} 0 ${theme.spacing.sm} ${theme.spacing.sm}; `, valueListArea: css` display: flex; @@ -418,7 +415,8 @@ export class UnthemedLokiLabelBrowser extends React.Component