Skip to content

catalog: remove the chart catalog#99788

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
tbg:remove-chart-catalog
Apr 25, 2023
Merged

catalog: remove the chart catalog#99788
craig[bot] merged 1 commit intocockroachdb:masterfrom
tbg:remove-chart-catalog

Conversation

@tbg
Copy link
Copy Markdown
Member

@tbg tbg commented Mar 28, 2023

Roughly the following, all in the same commit (sorry - discovered what needed to be done as I went, if reviewers find it hard to grok I can try to chop it into commits):

  • tsdump: simplify code a bit
  • tsdump: query AllMetricMetadata endpoint to get all timeseries names
    (rather than filling it server-side in the TSDB, which doesn't
    really have access to it now)
  • tsdump: return error instead of filling in metric names
  • serverpb: add GetInternalTimeSeriesNamesFromServer, this is code that
    essentially lived in catalog, but with some cleanups.
    We need this to go from "metric name" to "actual name the TSDB stores this
    under in KV" because that's what tsdump operates on.
  • catalog: return a flat mock stub in GenerateCatalog
  • catalog: pretty much delete everything else, including that
    list of metrics that needed to be manually adjusted every time
    a metric was added or removed.

A 23.1 cli will fail to fetch the timeseries from a 23.2+ host, but the error
message is informative and I don't think additional complexity to smoothen
mixed-version deploys is warranted. A 23.2+ cli will work fine with older
releases.

Closes #99791.

Tidy up a few issues that had to do with auto-generating Grafana dashboards
from the catalog:

Closes #54178.
Closes #78232.
Closes #81035.

Epic: none
Release note: None

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@tbg tbg force-pushed the remove-chart-catalog branch from c0f4440 to ccb5863 Compare March 28, 2023 12:22
@tbg tbg force-pushed the remove-chart-catalog branch 2 times, most recently from 3b2926d to ec0d660 Compare March 28, 2023 14:45
@tbg tbg marked this pull request as ready for review April 14, 2023 11:13
@tbg tbg requested a review from a team April 14, 2023 11:13
@tbg tbg requested review from a team as code owners April 14, 2023 11:13
@tbg
Copy link
Copy Markdown
Member Author

tbg commented Apr 14, 2023

@dhartunian I think this could be reviewed and merged, I can file an issue about the customcharts endpoint since I won't be able to deal with it anyway.

I'm going to rebase if you agree that now's a good time to push this over the line.

Copy link
Copy Markdown
Collaborator

@dhartunian dhartunian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

@tbg customcharts is completely unused and can be removed separately. yeah we should probably go through a bit of ceremony if it is part of our v1 api.

Reviewed 16 of 16 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @tbg)

- tsdump: simplify code a bit
- tsdump: query AllMetricMetadata endpoint to get all timeseries names
  (rather than filling it server-side in the TSDB, which doesn't
  really have access to it now)
- tsdump: return error instead of filling in metric names
- serverpb: add GetInternalTimeSeriesNamesFromServer, this is code that
  essentially lived in `catalog`, but with some cleanups.
  We need this to go from "metric name" to "actual name the TSDB stores this
  under in KV" because that's what `tsdump` operates on.
- catalog: return a flat mock stub in GenerateCatalog
- catalog: pretty much delete everything else, including that
  list of metrics that needed to be manually adjusted every time
  a metric was added or removed.

A 23.1 cli will fail to fetch the timeseries from a 23.2+ host, but the error
message is informative and I don't think additional complexity to smoothen
mixed-version deploys is warranted. A 23.2+ cli will work fine with older
releases.

Tidy up a few issues that had to do with auto-generating Grafana dashboards
from the catalog:

Closes cockroachdb#54178.
Closes cockroachdb#78232.
Closes cockroachdb#81035.

Epic: none
Release note: None
@tbg tbg force-pushed the remove-chart-catalog branch from ec0d660 to 3c5c368 Compare April 24, 2023 10:25
@tbg
Copy link
Copy Markdown
Member Author

tbg commented Apr 24, 2023

bors r=dhartunian

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 24, 2023

Build failed:

@tbg
Copy link
Copy Markdown
Member Author

tbg commented Apr 25, 2023

bors r=dhartunian

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 25, 2023

Build succeeded:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

3 participants