mirror of
https://github.com/prometheus/prometheus.git
synced 2025-01-11 13:57:36 -08:00
Merge release-2.33 forward into main (#10189)
* create a component to handle the search bar with debounce Signed-off-by: Augustin Husson <husson.augustin@gmail.com> * Update web/ui/react-app/src/pages/serviceDiscovery/Services.tsx Co-authored-by: Julius Volz <julius.volz@gmail.com> Signed-off-by: Augustin Husson <husson.augustin@gmail.com> * Nits after PR 10051 merge (#10159) Signed-off-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: Marco Pracucci <marco@pracucci.com> * tsdb/agent: Fix deadlock from simultaneous GC and write (#10166) * tsdb/agent: Fix deadlock from simultaneous GC and write This commit fixes a potential deadlock where storing in-memory series references could deadlock with a WAL GC cycle. Signed-off-by: Robert Fratto <robertfratto@gmail.com> * add missing license header Signed-off-by: Robert Fratto <robertfratto@gmail.com> * order local imports Signed-off-by: Robert Fratto <robertfratto@gmail.com> * align deadlock testing with discovery/manager_test.go method Also prevents GCs from running concurrently, which could also cause a deadlock (even though it's currently impossible for two GCs to run concurrently). Signed-off-by: Robert Fratto <robertfratto@gmail.com> * bump @nexucis/kvsearch to v0.4.0 Signed-off-by: Augustin Husson <husson.augustin@gmail.com> * Bump github.com/prometheus/client_golang to v1.12.0 Signed-off-by: beorn7 <beorn@grafana.com> * Cut v2.33.0-rc.1 Signed-off-by: beorn7 <beorn@grafana.com> Co-authored-by: Augustin Husson <husson.augustin@gmail.com> Co-authored-by: Julius Volz <julius.volz@gmail.com> Co-authored-by: Mauro Stettler <mauro.stettler@gmail.com> Co-authored-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: Robert Fratto <robertfratto@gmail.com>
This commit is contained in:
Julien Pivotto
GitHub
commit
a4d3206618
|
|
@ -1,3 +1,9 @@
|
|||
## 2.33.0-rc.1 / 2022-01-19
|
||||
|
||||
* [ENHANCEMENT] UI: Debounce search bar. #10157
|
||||
* [BUGFIX] TSDB: Fix deadlock from simultaneous GC and write. #10166
|
||||
* [BUGFIX] TSDB: Fix minor issues introduced in #10051. #10159
|
||||
|
||||
## 2.33.0-rc.0 / 2022-01-12
|
||||
|
||||
* [CHANGE] PromQL: Promote negative offset and `@` modifer to stable features. #10121
|
||||
|
|
|
|||
4
go.mod
4
go.mod
|
|
@ -46,7 +46,7 @@ require (
|
|||
github.com/opentracing/opentracing-go v1.2.0
|
||||
github.com/pkg/errors v0.9.1
|
||||
github.com/prometheus/alertmanager v0.23.0
|
||||
github.com/prometheus/client_golang v1.11.0
|
||||
github.com/prometheus/client_golang v1.12.0
|
||||
github.com/prometheus/client_model v0.2.0
|
||||
github.com/prometheus/common v0.32.1
|
||||
github.com/prometheus/common/sigv4 v0.1.0
|
||||
|
|
@ -62,7 +62,7 @@ require (
|
|||
golang.org/x/net v0.0.0-20220105145211-5b0dc2dfae98
|
||||
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
|
||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
|
||||
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e
|
||||
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
|
||||
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11
|
||||
golang.org/x/tools v0.1.9-0.20211209172050-90a85b2969be
|
||||
google.golang.org/api v0.64.0
|
||||
|
|
|
|||
9
go.sum
9
go.sum
|
|
@ -1144,8 +1144,9 @@ github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeD
|
|||
github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
|
||||
github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
|
||||
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
|
||||
github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ=
|
||||
github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
|
||||
github.com/prometheus/client_golang v1.12.0 h1:C+UIj/QWtmqY13Arb8kwMt5j34/0Z2iKamrJ+ryC0Gg=
|
||||
github.com/prometheus/client_golang v1.12.0/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
|
||||
github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
|
||||
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
|
||||
github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
|
||||
|
|
@ -1185,8 +1186,9 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
|
|||
github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
|
||||
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
|
||||
github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
|
||||
github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
|
||||
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
|
||||
github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
|
||||
github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
|
||||
github.com/prometheus/prometheus v0.0.0-20200609090129-a6600f564e3c/go.mod h1:S5n0C6tSgdnwWshBUceRx5G1OsjLv/EeZ9t3wIfEtsY=
|
||||
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
|
||||
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
|
||||
|
|
@ -1679,8 +1681,9 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc
|
|||
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
|
||||
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
|
||||
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
|
||||
|
|
|
|||
|
|
@ -93,6 +93,8 @@ type stripeSeries struct {
|
|||
series []map[chunks.HeadSeriesRef]*memSeries
|
||||
hashes []seriesHashmap
|
||||
locks []stripeLock
|
||||
|
||||
gcMut sync.Mutex
|
||||
}
|
||||
|
||||
type stripeLock struct {
|
||||
|
|
@ -120,8 +122,14 @@ func newStripeSeries(stripeSize int) *stripeSeries {
|
|||
// GC garbage collects old series that have not received a sample after mint
|
||||
// and will fully delete them.
|
||||
func (s *stripeSeries) GC(mint int64) map[chunks.HeadSeriesRef]struct{} {
|
||||
deleted := map[chunks.HeadSeriesRef]struct{}{}
|
||||
// NOTE(rfratto): GC will grab two locks, one for the hash and the other for
|
||||
// series. It's not valid for any other function to grab both locks,
|
||||
// otherwise a deadlock might occur when running GC in parallel with
|
||||
// appending.
|
||||
s.gcMut.Lock()
|
||||
defer s.gcMut.Unlock()
|
||||
|
||||
deleted := map[chunks.HeadSeriesRef]struct{}{}
|
||||
for hashLock := 0; hashLock < s.size; hashLock++ {
|
||||
s.locks[hashLock].Lock()
|
||||
|
||||
|
|
@ -179,14 +187,17 @@ func (s *stripeSeries) Set(hash uint64, series *memSeries) {
|
|||
hashLock = hash & uint64(s.size-1)
|
||||
refLock = uint64(series.ref) & uint64(s.size-1)
|
||||
)
|
||||
s.locks[hashLock].Lock()
|
||||
defer s.locks[hashLock].Unlock()
|
||||
|
||||
if hashLock != refLock {
|
||||
s.locks[refLock].Lock()
|
||||
defer s.locks[refLock].Unlock()
|
||||
}
|
||||
|
||||
s.hashes[hashLock].Set(hash, series)
|
||||
// We can't hold both locks at once otherwise we might deadlock with a
|
||||
// simulatenous call to GC.
|
||||
//
|
||||
// We update s.series first because GC expects anything in s.hashes to
|
||||
// already exist in s.series.
|
||||
s.locks[refLock].Lock()
|
||||
s.series[refLock][series.ref] = series
|
||||
s.locks[refLock].Unlock()
|
||||
|
||||
s.locks[hashLock].Lock()
|
||||
s.hashes[hashLock].Set(hash, series)
|
||||
s.locks[hashLock].Unlock()
|
||||
}
|
||||
|
|
|
|||
76
tsdb/agent/series_test.go
Normal file
76
tsdb/agent/series_test.go
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
// Copyright 2022 The Prometheus Authors
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package agent
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/prometheus/prometheus/model/labels"
|
||||
"github.com/prometheus/prometheus/tsdb/chunks"
|
||||
)
|
||||
|
||||
func TestNoDeadlock(t *testing.T) {
|
||||
const numWorkers = 1000
|
||||
|
||||
var (
|
||||
wg sync.WaitGroup
|
||||
started = make(chan struct{})
|
||||
stripeSeries = newStripeSeries(3)
|
||||
)
|
||||
|
||||
wg.Add(numWorkers)
|
||||
for i := 0; i < numWorkers; i++ {
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
<-started
|
||||
_ = stripeSeries.GC(math.MaxInt64)
|
||||
}()
|
||||
}
|
||||
|
||||
wg.Add(numWorkers)
|
||||
for i := 0; i < numWorkers; i++ {
|
||||
go func(i int) {
|
||||
defer wg.Done()
|
||||
<-started
|
||||
|
||||
series := &memSeries{
|
||||
ref: chunks.HeadSeriesRef(i),
|
||||
lset: labels.FromMap(map[string]string{
|
||||
"id": fmt.Sprintf("%d", i),
|
||||
}),
|
||||
}
|
||||
stripeSeries.Set(series.lset.Hash(), series)
|
||||
}(i)
|
||||
}
|
||||
|
||||
finished := make(chan struct{})
|
||||
go func() {
|
||||
wg.Wait()
|
||||
close(finished)
|
||||
}()
|
||||
|
||||
close(started)
|
||||
select {
|
||||
case <-finished:
|
||||
return
|
||||
case <-time.After(15 * time.Second):
|
||||
require.FailNow(t, "deadlock detected")
|
||||
}
|
||||
}
|
||||
|
|
@ -34,7 +34,7 @@ type chunkWriteJob struct {
|
|||
|
||||
// chunkWriteQueue is a queue for writing chunks to disk in a non-blocking fashion.
|
||||
// Chunks that shall be written get added to the queue, which is consumed asynchronously.
|
||||
// Adding jobs to the job is non-blocking as long as the queue isn't full.
|
||||
// Adding jobs to the queue is non-blocking as long as the queue isn't full.
|
||||
type chunkWriteQueue struct {
|
||||
jobs chan chunkWriteJob
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ const (
|
|||
CRCSize = 4
|
||||
// MaxHeadChunkMetaSize is the max size of an mmapped chunks minus the chunks data.
|
||||
// Max because the uvarint size can be smaller.
|
||||
MaxHeadChunkMetaSize = SeriesRefSize + 2*MintMaxtSize + ChunksFormatVersionSize + MaxChunkLengthFieldSize + CRCSize
|
||||
MaxHeadChunkMetaSize = SeriesRefSize + 2*MintMaxtSize + ChunkEncodingSize + MaxChunkLengthFieldSize + CRCSize
|
||||
// MinWriteBufferSize is the minimum write buffer size allowed.
|
||||
MinWriteBufferSize = 64 * 1024 // 64KB.
|
||||
// MaxWriteBufferSize is the maximum write buffer size allowed.
|
||||
|
|
@ -113,7 +113,7 @@ func (f *chunkPos) getNextChunkRef(chk chunkenc.Chunk) (chkRef ChunkDiskMapperRe
|
|||
chkLen := uint64(len(chk.Bytes()))
|
||||
bytesToWrite := f.bytesToWriteForChunk(chkLen)
|
||||
|
||||
if f.shouldCutNewFile(chkLen) {
|
||||
if f.shouldCutNewFile(bytesToWrite) {
|
||||
f.toNewFile()
|
||||
f.cutFile = false
|
||||
cutFile = true
|
||||
|
|
@ -144,14 +144,14 @@ func (f *chunkPos) initSeq(seq uint64) {
|
|||
}
|
||||
|
||||
// shouldCutNewFile returns whether a new file should be cut based on the file size.
|
||||
// The read or write lock on chunkPos must be held when calling this.
|
||||
func (f *chunkPos) shouldCutNewFile(chunkSize uint64) bool {
|
||||
// Not thread safe, a lock must be held when calling this.
|
||||
func (f *chunkPos) shouldCutNewFile(bytesToWrite uint64) bool {
|
||||
if f.cutFile {
|
||||
return true
|
||||
}
|
||||
|
||||
return f.offset == 0 || // First head chunk file.
|
||||
f.offset+chunkSize+MaxHeadChunkMetaSize > MaxHeadChunkFileSize // Exceeds the max head chunk file size.
|
||||
f.offset+bytesToWrite > MaxHeadChunkFileSize // Exceeds the max head chunk file size.
|
||||
}
|
||||
|
||||
// bytesToWriteForChunk returns the number of bytes that will need to be written for the given chunk size,
|
||||
|
|
|
|||
16
web/ui/package-lock.json
generated
16
web/ui/package-lock.json
generated
|
|
@ -1598,9 +1598,9 @@
|
|||
"integrity": "sha512-Z1+ADKY0fxdBE28REraWhUCNy+Bp5UmpK3Tc/5wdCDpY+6fXh8l2csMtbPGaqEBsyGLxJz9wUYGCf+CW9unyvQ=="
|
||||
},
|
||||
"node_modules/@nexucis/kvsearch": {
|
||||
"version": "0.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@nexucis/kvsearch/-/kvsearch-0.3.0.tgz",
|
||||
"integrity": "sha512-tHIH6W/mRUZZ0ZQyRbgp2uhat+2O1c1jX1EC6NHv7/8OIeHx1HBZ5ZZb0KSUVWl4jkNzYw6AO39OoTELtrjaQw==",
|
||||
"version": "0.4.0",
|
||||
"resolved": "https://registry.npmjs.org/@nexucis/kvsearch/-/kvsearch-0.4.0.tgz",
|
||||
"integrity": "sha512-5kWxzjLhCucArZshf0bCcmU61aGFgrm98iG6/LEeKejOuoTq1M7sumcjGQ5FR0xMKQWmwC9mr7OvWgAmolxWSg==",
|
||||
"dependencies": {
|
||||
"@nexucis/fuzzy": "^0.3.0"
|
||||
}
|
||||
|
|
@ -7269,7 +7269,7 @@
|
|||
"@fortawesome/free-solid-svg-icons": "^5.7.2",
|
||||
"@fortawesome/react-fontawesome": "^0.1.16",
|
||||
"@nexucis/fuzzy": "^0.3.0",
|
||||
"@nexucis/kvsearch": "^0.3.0",
|
||||
"@nexucis/kvsearch": "^0.4.0",
|
||||
"bootstrap": "^4.6.1",
|
||||
"codemirror-promql": "0.19.0",
|
||||
"css.escape": "^1.5.1",
|
||||
|
|
@ -27693,9 +27693,9 @@
|
|||
"integrity": "sha512-Z1+ADKY0fxdBE28REraWhUCNy+Bp5UmpK3Tc/5wdCDpY+6fXh8l2csMtbPGaqEBsyGLxJz9wUYGCf+CW9unyvQ=="
|
||||
},
|
||||
"@nexucis/kvsearch": {
|
||||
"version": "0.3.0",
|
||||
"resolved": "https://registry.npmjs.org/@nexucis/kvsearch/-/kvsearch-0.3.0.tgz",
|
||||
"integrity": "sha512-tHIH6W/mRUZZ0ZQyRbgp2uhat+2O1c1jX1EC6NHv7/8OIeHx1HBZ5ZZb0KSUVWl4jkNzYw6AO39OoTELtrjaQw==",
|
||||
"version": "0.4.0",
|
||||
"resolved": "https://registry.npmjs.org/@nexucis/kvsearch/-/kvsearch-0.4.0.tgz",
|
||||
"integrity": "sha512-5kWxzjLhCucArZshf0bCcmU61aGFgrm98iG6/LEeKejOuoTq1M7sumcjGQ5FR0xMKQWmwC9mr7OvWgAmolxWSg==",
|
||||
"requires": {
|
||||
"@nexucis/fuzzy": "^0.3.0"
|
||||
}
|
||||
|
|
@ -29719,7 +29719,7 @@
|
|||
"@fortawesome/free-solid-svg-icons": "^5.7.2",
|
||||
"@fortawesome/react-fontawesome": "^0.1.16",
|
||||
"@nexucis/fuzzy": "^0.3.0",
|
||||
"@nexucis/kvsearch": "^0.3.0",
|
||||
"@nexucis/kvsearch": "^0.4.0",
|
||||
"@testing-library/react-hooks": "^7.0.1",
|
||||
"@types/enzyme": "^3.10.10",
|
||||
"@types/flot": "0.0.32",
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
"@fortawesome/free-solid-svg-icons": "^5.7.2",
|
||||
"@fortawesome/react-fontawesome": "^0.1.16",
|
||||
"@nexucis/fuzzy": "^0.3.0",
|
||||
"@nexucis/kvsearch": "^0.3.0",
|
||||
"@nexucis/kvsearch": "^0.4.0",
|
||||
"bootstrap": "^4.6.1",
|
||||
"codemirror-promql": "0.19.0",
|
||||
"css.escape": "^1.5.1",
|
||||
|
|
|
|||
31
web/ui/react-app/src/components/SearchBar.tsx
Normal file
31
web/ui/react-app/src/components/SearchBar.tsx
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
import React, { ChangeEvent, FC } from 'react';
|
||||
import { Input, InputGroup, InputGroupAddon, InputGroupText } from 'reactstrap';
|
||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
||||
import { faSearch } from '@fortawesome/free-solid-svg-icons';
|
||||
|
||||
export interface SearchBarProps {
|
||||
handleChange: (e: ChangeEvent<HTMLTextAreaElement | HTMLInputElement>) => void;
|
||||
placeholder: string;
|
||||
}
|
||||
|
||||
const SearchBar: FC<SearchBarProps> = ({ handleChange, placeholder }) => {
|
||||
let filterTimeout: NodeJS.Timeout;
|
||||
|
||||
const handleSearchChange = (e: ChangeEvent<HTMLTextAreaElement | HTMLInputElement>) => {
|
||||
clearTimeout(filterTimeout);
|
||||
filterTimeout = setTimeout(() => {
|
||||
handleChange(e);
|
||||
}, 300);
|
||||
};
|
||||
|
||||
return (
|
||||
<InputGroup>
|
||||
<InputGroupAddon addonType="prepend">
|
||||
<InputGroupText>{<FontAwesomeIcon icon={faSearch} />}</InputGroupText>
|
||||
</InputGroupAddon>
|
||||
<Input autoFocus onChange={handleSearchChange} placeholder={placeholder} />
|
||||
</InputGroup>
|
||||
);
|
||||
};
|
||||
|
||||
export default SearchBar;
|
||||
|
|
@ -8,9 +8,8 @@ import { mapObjEntries } from '../../utils';
|
|||
import { usePathPrefix } from '../../contexts/PathPrefixContext';
|
||||
import { API_PATH } from '../../constants/constants';
|
||||
import { KVSearch } from '@nexucis/kvsearch';
|
||||
import { Container, Input, InputGroup, InputGroupAddon, InputGroupText } from 'reactstrap';
|
||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
||||
import { faSearch } from '@fortawesome/free-solid-svg-icons';
|
||||
import { Container } from 'reactstrap';
|
||||
import SearchBar from '../../components/SearchBar';
|
||||
|
||||
interface ServiceMap {
|
||||
activeTargets: Target[];
|
||||
|
|
@ -117,12 +116,7 @@ export const ServiceDiscoveryContent: FC<ServiceMap> = ({ activeTargets, dropped
|
|||
<>
|
||||
<h2>Service Discovery</h2>
|
||||
<Container>
|
||||
<InputGroup>
|
||||
<InputGroupAddon addonType="prepend">
|
||||
<InputGroupText>{<FontAwesomeIcon icon={faSearch} />}</InputGroupText>
|
||||
</InputGroupAddon>
|
||||
<Input autoFocus onChange={handleSearchChange} placeholder="Filter by labels" />
|
||||
</InputGroup>
|
||||
<SearchBar handleChange={handleSearchChange} placeholder="Filter by labels" />
|
||||
</Container>
|
||||
<ul>
|
||||
{mapObjEntries(targetList, ([k, v]) => (
|
||||
|
|
|
|||
|
|
@ -5,14 +5,13 @@ import { API_PATH } from '../../constants/constants';
|
|||
import { groupTargets, ScrapePool, ScrapePools, Target } from './target';
|
||||
import { withStatusIndicator } from '../../components/withStatusIndicator';
|
||||
import { ChangeEvent, FC, useEffect, useState } from 'react';
|
||||
import { Col, Collapse, Input, InputGroup, InputGroupAddon, InputGroupText, Row } from 'reactstrap';
|
||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
||||
import { faSearch } from '@fortawesome/free-solid-svg-icons';
|
||||
import { Col, Collapse, Row } from 'reactstrap';
|
||||
import { ScrapePoolContent } from './ScrapePoolContent';
|
||||
import Filter, { Expanded, FilterData } from './Filter';
|
||||
import { useLocalStorage } from '../../hooks/useLocalStorage';
|
||||
import styles from './ScrapePoolPanel.module.css';
|
||||
import { ToggleMoreLess } from '../../components/ToggleMoreLess';
|
||||
import SearchBar from '../../components/SearchBar';
|
||||
|
||||
interface ScrapePoolListProps {
|
||||
activeTargets: Target[];
|
||||
|
|
@ -98,12 +97,7 @@ const ScrapePoolListContent: FC<ScrapePoolListProps> = ({ activeTargets }) => {
|
|||
<Filter filter={filter} setFilter={setFilter} expanded={expanded} setExpanded={setExpanded} />
|
||||
</Col>
|
||||
<Col xs="6">
|
||||
<InputGroup>
|
||||
<InputGroupAddon addonType="prepend">
|
||||
<InputGroupText>{<FontAwesomeIcon icon={faSearch} />}</InputGroupText>
|
||||
</InputGroupAddon>
|
||||
<Input autoFocus onChange={handleSearchChange} placeholder="Filter by endpoint or labels" />
|
||||
</InputGroup>
|
||||
<SearchBar handleChange={handleSearchChange} placeholder="Filter by endpoint or labels" />
|
||||
</Col>
|
||||
</Row>
|
||||
{Object.keys(poolList)
|
||||
|
|
|
|||
Loading…
Reference in a new issue