From ebee995dc24987f58e43157d48ef51f451d66a4e Mon Sep 17 00:00:00 2001 From: Kemal Akkoyun Date: Thu, 23 Apr 2020 09:52:56 +0200 Subject: [PATCH 1/8] Adjust memcached operation buckets (#2504) Signed-off-by: Kemal Akkoyun --- pkg/cacheutil/memcached_client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cacheutil/memcached_client.go b/pkg/cacheutil/memcached_client.go index 29f124b6c3c..99fc545786d 100644 --- a/pkg/cacheutil/memcached_client.go +++ b/pkg/cacheutil/memcached_client.go @@ -240,7 +240,7 @@ func newMemcachedClient( Name: "thanos_memcached_operation_duration_seconds", Help: "Duration of operations against memcached.", ConstLabels: prometheus.Labels{"name": name}, - Buckets: []float64{0.001, 0.005, 0.01, 0.025, 0.05, 0.1, 0.2, 0.5, 1}, + Buckets: []float64{0.001, 0.005, 0.01, 0.025, 0.05, 0.1, 0.2, 0.5, 1, 3, 6, 10}, }, []string{"operation"}) c.duration.WithLabelValues(opGetMulti) c.duration.WithLabelValues(opSet) From 66dd2fbbcc2ab85236a56e45f01f5c2932e34543 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Thu, 23 Apr 2020 10:29:36 +0200 Subject: [PATCH 2/8] pkg/query: remove obsolete 'thanos_store_node_info' metric (#2505) Signed-off-by: Simon Pasquier --- CHANGELOG.md | 7 ++++--- pkg/query/storeset.go | 16 ++-------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90a7713d05f..66fe87b6c0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ We use *breaking* word for marking changes that are not backward compatible (rel - [#2501](https://github.com/thanos-io/thanos/pull/2501) Query: gracefully handle additional fields in `SeriesResponse` protobuf message that may be added in the future. +### Changed + +- [#2505](https://github.com/thanos.io/thanos/pull/2505) Store: remove obsolete `thanos_store_node_info` metric. + ## [v0.12.1](https://github.com/thanos-io/thanos/releases/tag/v0.12.1) - 2020.04.20 ### Fixed @@ -23,9 +27,6 @@ We use *breaking* word for marking changes that are not backward compatible (rel - [#2474](https://github.com/thanos-io/thanos/pull/2474) Store: fix a panic caused by concurrent memory access during block filtering. - [#2472](https://github.com/thanos-io/thanos/pull/2472) Compact: fix a bug where partial blocks were never deleted, causing spam of warnings. - [#2484](https://github.com/thanos-io/thanos/pull/2484) Query/Ruler: fix issue #2483, when web.route-prefix is set, it is added twice in HTTP router prefix. - -### Fixed - - [#2416](https://github.com/thanos-io/thanos/pull/2416) Bucket: fixes issue #2416 bug in `inspect --sort-by` doesn't work correctly in all cases - [#2411](https://github.com/thanos-io/thanos/pull/2411) Query: fix a bug where queries might not time out sometimes due to issues with one or more StoreAPIs diff --git a/pkg/query/storeset.go b/pkg/query/storeset.go index aafb003f3fa..aa9430178a3 100644 --- a/pkg/query/storeset.go +++ b/pkg/query/storeset.go @@ -85,15 +85,14 @@ func (s *grpcStoreSpec) Metadata(ctx context.Context, client storepb.StoreClient return resp.LabelSets, resp.MinTime, resp.MaxTime, component.FromProto(resp.StoreType), nil } -// storeSetNodeCollector is metric collector for Guge indicated number of available storeAPIs for Querier. -// Collector is requires as we want atomic updates for all 'thanos_store_nodes_grpc_connections' series. +// storeSetNodeCollector is a metric collector reporting the number of available storeAPIs for Querier. +// A Collector is required as we want atomic updates for all 'thanos_store_nodes_grpc_connections' series. type storeSetNodeCollector struct { mtx sync.Mutex storeNodes map[component.StoreAPI]map[string]int storePerExtLset map[string]int connectionsDesc *prometheus.Desc - nodeInfoDesc *prometheus.Desc } func newStoreSetNodeCollector() *storeSetNodeCollector { @@ -104,13 +103,6 @@ func newStoreSetNodeCollector() *storeSetNodeCollector { "Number of gRPC connection to Store APIs. Opened connection means healthy store APIs available for Querier.", []string{"external_labels", "store_type"}, nil, ), - // TODO(bwplotka): Obsolete; Replaced by thanos_store_nodes_grpc_connections. - // Remove in next minor release. - nodeInfoDesc: prometheus.NewDesc( - "thanos_store_node_info", - "Deprecated, use thanos_store_nodes_grpc_connections instead.", - []string{"external_labels"}, nil, - ), } } @@ -134,7 +126,6 @@ func (c *storeSetNodeCollector) Update(nodes map[component.StoreAPI]map[string]i func (c *storeSetNodeCollector) Describe(ch chan<- *prometheus.Desc) { ch <- c.connectionsDesc - ch <- c.nodeInfoDesc } func (c *storeSetNodeCollector) Collect(ch chan<- prometheus.Metric) { @@ -150,9 +141,6 @@ func (c *storeSetNodeCollector) Collect(ch chan<- prometheus.Metric) { ch <- prometheus.MustNewConstMetric(c.connectionsDesc, prometheus.GaugeValue, float64(occurrences), externalLabels, storeTypeStr) } } - for externalLabels, occur := range c.storePerExtLset { - ch <- prometheus.MustNewConstMetric(c.nodeInfoDesc, prometheus.GaugeValue, float64(occur), externalLabels) - } } // StoreSet maintains a set of active stores. It is backed up by Store Specifications that are dynamically fetched on From 28ea33b5d3d396f45f231a7879b25646b45dbcec Mon Sep 17 00:00:00 2001 From: Povilas Versockas Date: Thu, 23 Apr 2020 12:06:55 +0300 Subject: [PATCH 3/8] Add Community information (#2510) * Add Community information Signed-off-by: Povilas Versockas * Fixes after review Signed-off-by: Povilas Versockas * Move to contributing menu Signed-off-by: Povilas Versockas --- docs/community.md | 40 ++++++++++++++++++++++++++++++++++++++ website/layouts/index.html | 12 +++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 docs/community.md diff --git a/docs/community.md b/docs/community.md new file mode 100644 index 00000000000..f6eb7b85986 --- /dev/null +++ b/docs/community.md @@ -0,0 +1,40 @@ +--- +title: Community +type: docs +menu: contributing +slug: /community.md +--- + +# General + +Thanos is an open source project and we value and welcome new contributors and members of the community. Here are ways to get in touch with the community: + +## Thanos Community meeting + +Thanos Community Meeting is a **public** and **recorded** monthly meeting every second Wednesday 12:00 UTC ([Time zone converter](https://www.thetimezoneconverter.com/?t=12%3A00%20pm&tz=UTC%20(Coordinated%20Universal%20Time)&)). + +Thanos maintainers & the community meet to discuss open issues, features and other Thanos related things. +Everyone is welcome to join & add items to the agenda. The meeting happens in Zoom. Right now meeting is in a Webinar format, where only small amount of people will have ability to speak and video share, due to recent [Zoombombing](https://en.wikipedia.org/wiki/Zoombombing) issues. + +* When: Monthly, every second Wednesday 12:00 UTC ([Time zone converter](https:// www.thetimezoneconverter.com/?t=12%3A00%20pm&tz=UTC%20(Coordinated%20Universal%20Time)&)). +* Google Calendar: [Google Calendar](https://calendar.google.com/calendar/embed?src=go39q7eu71vvu3gfrkbup6b254%40group.calendar.google.com) +* Agenda: [https://bit.ly/thanos-community-agenda](https://bit.ly/thanos-community-agenda) +* Link to join zoom webinar: [https://zoom.us/j/96476403386](https://zoom.us/j/96476403386) + +If you have any suggestions, how we can run the meeting better, please let @povilasv know in CNCF slack. + +## Slack + +* General channel: [#thanos](https://slack.cncf.io/) +* Development related channel: [#thanos-dev](https://slack.cncf.io/) +* Thanos PR discussion & review: [#thanos-prs](https://slack.cncf.io/) + +## Prometheus Community & Ecosystem Meeting + +The Prometheus & The Ecosystem community meeting is intended to provide a holistic overview of community activities, critical release information, and governance updates for Prometheus & the Ecosystem projects. + +Thanos Maintainers regularly join and give announcements and updates. + +Meeting details: [https://bit.ly/prometheus-community-agenda](https://bit.ly/prometheus-community-agenda) + + diff --git a/website/layouts/index.html b/website/layouts/index.html index ffb4d7f1837..9767ab6dac0 100644 --- a/website/layouts/index.html +++ b/website/layouts/index.html @@ -14,6 +14,11 @@

Open source, highly available Prometheus setup with long term s Getting Started +
  • + + Community + +
  • Download @@ -102,9 +107,14 @@

    Used By

    -

    Join the community !

    +

    Join the community !

    Join users and companies that are using Thanos in production.