Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

## master / unreleased

* [CHANGE] Cassandra backend support is now GA (stable).
* [CHANGE] Blocks storage is now GA (stable). The `-experimental` prefix has been removed from all CLI flags related to the blocks storage (no YAML config changes).
* [CHANGE] Cassandra backend support is now GA (stable). #3180
* [CHANGE] Blocks storage is now GA (stable). The `-experimental` prefix has been removed from all CLI flags related to the blocks storage (no YAML config changes). #3180
- `-experimental.blocks-storage.*` flags renamed to `-blocks-storage.*`
- `-experimental.store-gateway.*` flags renamed to `-store-gateway.*`
- `-experimental.querier.store-gateway-client.*` flags renamed to `-querier.store-gateway-client.*`
Expand Down
4 changes: 4 additions & 0 deletions docs/api/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,10 @@ DELETE <legacy-http-prefix>/rules/{namespace}/{groupName}

Deletes a rule group by namespace and group name. This endpoints returns `202` on success.

_This experimental endpoint is disabled by default and can be enabled via the `-experimental.ruler.enable-api` CLI flag (or its respective YAML config option)._

_Requires [authentication](#authentication)._

### Delete namespace

```
Expand Down
4 changes: 2 additions & 2 deletions integration/e2ecortex/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,8 @@ func (c *Client) DeleteRuleGroup(namespace string, groupName string) error {
return nil
}

// DeleteNamespace deletes all the rule groups (and the namespace itself).
func (c *Client) DeleteNamespace(namespace string) error {
// DeleteRuleNamespace deletes all the rule groups (and the namespace itself).
func (c *Client) DeleteRuleNamespace(namespace string) error {
// Create HTTP request
req, err := http.NewRequest("DELETE", fmt.Sprintf("http://%s/api/prom/rules/%s", c.rulerAddress, url.PathEscape(namespace)), nil)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion integration/ruler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func TestRulerAPI(t *testing.T) {

// Delete the set rule groups
require.NoError(t, c.DeleteRuleGroup(namespaceOne, ruleGroup.Name))
require.NoError(t, c.DeleteNamespace(namespaceTwo))
require.NoError(t, c.DeleteRuleNamespace(namespaceTwo))

// Wait until the users manager has been terminated
require.NoError(t, ruler.WaitSumMetrics(e2e.Equals(0), "cortex_ruler_managers_total"))
Expand Down