diff --git a/go.mod b/go.mod index fafbb08ded58..f518eb2f5fb8 100644 --- a/go.mod +++ b/go.mod @@ -11,11 +11,12 @@ replace github.com/denisenkom/go-mssqldb => github.com/grafana/go-mssqldb v0.0.0 // It's also present on grafana/loki's go.mod so we'll need till it gets updated. replace k8s.io/client-go => k8s.io/client-go v0.22.1 -replace github.com/russellhaering/goxmldsig@v1.1.0 => github.com/russellhaering/goxmldsig v1.1.1 - // Avoid using v2.0.0+incompatible Redigo used by dependencies as the latest maintained branch of Redigo is v1. replace github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.9 +// Bump it up to avoid https://github.com/prometheus/exporter-toolkit/security/advisories/GHSA-7rg2-cxvp-9p7p +replace github.com/prometheus/exporter-toolkit@v0.7.1 => github.com/prometheus/exporter-toolkit v0.7.2 + require ( cloud.google.com/go/storage v1.21.0 cuelang.org/go v0.4.3 @@ -208,7 +209,7 @@ require ( github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect - github.com/prometheus/exporter-toolkit v0.7.1 // indirect + github.com/prometheus/exporter-toolkit v0.7.2 // indirect github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b // indirect diff --git a/go.sum b/go.sum index 4060f922a790..285959d424ff 100644 --- a/go.sum +++ b/go.sum @@ -1261,7 +1261,6 @@ github.com/google/go-replayers/httpreplay v1.1.1/go.mod h1:gN9GeLIs7l6NUoVaSSnv2 github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -2163,8 +2162,9 @@ github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdD github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/exporter-toolkit v0.6.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g= -github.com/prometheus/exporter-toolkit v0.7.1 h1:c6RXaK8xBVercEeUQ4tRNL8UGWzDHfvj9dseo1FcK1Y= github.com/prometheus/exporter-toolkit v0.7.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g= +github.com/prometheus/exporter-toolkit v0.7.2 h1:O7dcXagEAkXNSU6f3uXYqrhIjHArvxVeGAm0YGctino= +github.com/prometheus/exporter-toolkit v0.7.2/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g= github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289 h1:dTUS1vaLWq+Y6XKOTnrFpoVsQKLCbCp1OLj24TDi7oM= github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289/go.mod h1:FGbBv5OPKjch+jNUJmEQpMZytIdyW0NdBtWFcfSKusc= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= diff --git a/public/app/percona/inventory/Tabs/Services/Clusters.utils.ts b/public/app/percona/inventory/Tabs/Services/Clusters.utils.ts index f14e63e93e83..b76cb46b78ca 100644 --- a/public/app/percona/inventory/Tabs/Services/Clusters.utils.ts +++ b/public/app/percona/inventory/Tabs/Services/Clusters.utils.ts @@ -6,12 +6,12 @@ import { FlattenService } from '../../Inventory.types'; import { ServicesCluster } from './Clusters.type'; export const getClustersFromServices = (services: FlattenService[]): ServicesCluster[] => { - const clusterNames = [...new Set(services.map((s) => s.cluster || s.serviceName))]; + const clusterNames = [...new Set(services.map((s) => s.cluster || ''))]; return clusterNames.map((clusterName) => { const clusterServices = services.filter((s) => s.cluster === clusterName); return { - name: clusterName, + name: clusterName || 'Non-clustered services', type: clusterServices[0]?.type as Databases, services: clusterServices, }; diff --git a/public/app/percona/shared/components/Elements/Table/Table.styles.ts b/public/app/percona/shared/components/Elements/Table/Table.styles.ts index 6d1f1ef06ea3..2163201c29fb 100644 --- a/public/app/percona/shared/components/Elements/Table/Table.styles.ts +++ b/public/app/percona/shared/components/Elements/Table/Table.styles.ts @@ -81,6 +81,9 @@ export const getStyles = (theme: GrafanaTheme) => { text-overflow: ${noHiddenOverflow ? 'clip' : 'ellipsis'}; white-space: ${noHiddenOverflow ? 'normal' : 'nowrap'}; `, + summaryWrap: css` + white-space: normal !important; + `, infoIcon: css` margin-left: ${spacing.sm}; `, diff --git a/public/app/percona/shared/components/Elements/Table/Table.tsx b/public/app/percona/shared/components/Elements/Table/Table.tsx index b37dd8013230..5c58620b8a2d 100644 --- a/public/app/percona/shared/components/Elements/Table/Table.tsx +++ b/public/app/percona/shared/components/Elements/Table/Table.tsx @@ -223,7 +223,8 @@ export const Table: FC = ({ { className: cx( cell.column.className, - style.tableCell(!!cell.column.noHiddenOverflow) + style.tableCell(!!cell.column.noHiddenOverflow), + cell.column?.Header === 'Summary' ? style.summaryWrap : undefined ), style: cell.column.style, },