Skip to content

Commit 1f32afc

Browse files
periklisperiklis
authored
Merge pull request #384 from periklis/backport-pr-14587-5.9
[release-5.9] Backport PR grafana#14587
2 parents a1c77d2 + 22f99be commit 1f32afc

File tree

4 files changed

+3
-692
lines changed

4 files changed

+3
-692
lines changed

‎operator/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Release 5.9.9
44

5+
- [14587](https://github.com/grafana/loki/pull/14587) **JoaoBraveCoding**: fix(operator): correctly ignore again BlotDB dashboards
56
- [14447](https://github.com/grafana/loki/pull/14447) **periklis**: refactor(operator)!: Migrate project layout to kubebuilder go/v4
67
- [14526](https://github.com/grafana/loki/pull/14526) **periklis**: feat(operator): Update Loki operand to v3.2.1
78
- [14445](https://github.com/grafana/loki/pull/14445) **periklis**: chore(operator): Upgrade operator-sdk 1.37.0 and kind 0.23.0

‎operator/internal/manifests/openshift/internal/dashboards/static/grafana-dashboard-lokistack-reads.json

-345
Original file line numberDiff line numberDiff line change
@@ -1746,351 +1746,6 @@
17461746
"showTitle": true,
17471747
"title": "TSBD Index",
17481748
"titleSize": "h6"
1749-
},
1750-
{
1751-
"collapse": false,
1752-
"height": "250px",
1753-
"panels": [
1754-
{
1755-
"aliasColors": {
1756-
"1xx": "#EAB839",
1757-
"2xx": "#7EB26D",
1758-
"3xx": "#6ED0E0",
1759-
"4xx": "#EF843C",
1760-
"5xx": "#E24D42",
1761-
"error": "#E24D42",
1762-
"success": "#7EB26D"
1763-
},
1764-
"datasource": "$datasource",
1765-
"fieldConfig": {
1766-
"defaults": {
1767-
"custom": {
1768-
"drawStyle": "line",
1769-
"fillOpacity": 100,
1770-
"lineWidth": 0,
1771-
"pointSize": 5,
1772-
"showPoints": "never",
1773-
"spanNulls": false,
1774-
"stacking": {
1775-
"group": "A",
1776-
"mode": "normal"
1777-
}
1778-
},
1779-
"min": 0,
1780-
"thresholds": {
1781-
"mode": "absolute",
1782-
"steps": [ ]
1783-
},
1784-
"unit": "short"
1785-
},
1786-
"overrides": [
1787-
{
1788-
"matcher": {
1789-
"id": "byName",
1790-
"options": "1xx"
1791-
},
1792-
"properties": [
1793-
{
1794-
"id": "color",
1795-
"value": {
1796-
"fixedColor": "#EAB839",
1797-
"mode": "fixed"
1798-
}
1799-
}
1800-
]
1801-
},
1802-
{
1803-
"matcher": {
1804-
"id": "byName",
1805-
"options": "2xx"
1806-
},
1807-
"properties": [
1808-
{
1809-
"id": "color",
1810-
"value": {
1811-
"fixedColor": "#7EB26D",
1812-
"mode": "fixed"
1813-
}
1814-
}
1815-
]
1816-
},
1817-
{
1818-
"matcher": {
1819-
"id": "byName",
1820-
"options": "3xx"
1821-
},
1822-
"properties": [
1823-
{
1824-
"id": "color",
1825-
"value": {
1826-
"fixedColor": "#6ED0E0",
1827-
"mode": "fixed"
1828-
}
1829-
}
1830-
]
1831-
},
1832-
{
1833-
"matcher": {
1834-
"id": "byName",
1835-
"options": "4xx"
1836-
},
1837-
"properties": [
1838-
{
1839-
"id": "color",
1840-
"value": {
1841-
"fixedColor": "#EF843C",
1842-
"mode": "fixed"
1843-
}
1844-
}
1845-
]
1846-
},
1847-
{
1848-
"matcher": {
1849-
"id": "byName",
1850-
"options": "5xx"
1851-
},
1852-
"properties": [
1853-
{
1854-
"id": "color",
1855-
"value": {
1856-
"fixedColor": "#E24D42",
1857-
"mode": "fixed"
1858-
}
1859-
}
1860-
]
1861-
},
1862-
{
1863-
"matcher": {
1864-
"id": "byName",
1865-
"options": "OK"
1866-
},
1867-
"properties": [
1868-
{
1869-
"id": "color",
1870-
"value": {
1871-
"fixedColor": "#7EB26D",
1872-
"mode": "fixed"
1873-
}
1874-
}
1875-
]
1876-
},
1877-
{
1878-
"matcher": {
1879-
"id": "byName",
1880-
"options": "cancel"
1881-
},
1882-
"properties": [
1883-
{
1884-
"id": "color",
1885-
"value": {
1886-
"fixedColor": "#A9A9A9",
1887-
"mode": "fixed"
1888-
}
1889-
}
1890-
]
1891-
},
1892-
{
1893-
"matcher": {
1894-
"id": "byName",
1895-
"options": "error"
1896-
},
1897-
"properties": [
1898-
{
1899-
"id": "color",
1900-
"value": {
1901-
"fixedColor": "#E24D42",
1902-
"mode": "fixed"
1903-
}
1904-
}
1905-
]
1906-
},
1907-
{
1908-
"matcher": {
1909-
"id": "byName",
1910-
"options": "success"
1911-
},
1912-
"properties": [
1913-
{
1914-
"id": "color",
1915-
"value": {
1916-
"fixedColor": "#7EB26D",
1917-
"mode": "fixed"
1918-
}
1919-
}
1920-
]
1921-
}
1922-
]
1923-
},
1924-
"fill": 10,
1925-
"id": 22,
1926-
"linewidth": 0,
1927-
"links": [ ],
1928-
"options": {
1929-
"legend": {
1930-
"showLegend": true
1931-
},
1932-
"tooltip": {
1933-
"mode": "single",
1934-
"sort": "none"
1935-
}
1936-
},
1937-
"span": 4,
1938-
"stack": true,
1939-
"targets": [
1940-
{
1941-
"expr": "sum by (status) (\n label_replace(label_replace(rate(loki_boltdb_shipper_request_duration_seconds_count{namespace=\"$namespace\",job=~\".+-index-gateway-http\", operation=\"Shipper.Query\"}[$__rate_interval]),\n \"status\", \"${1}xx\", \"status_code\", \"([0-9])..\"),\n \"status\", \"${1}\", \"status_code\", \"([a-z]+)\"))\n",
1942-
"format": "time_series",
1943-
"intervalFactor": 2,
1944-
"legendFormat": "{{status}}",
1945-
"refId": "A",
1946-
"step": 10
1947-
}
1948-
],
1949-
"title": "QPS",
1950-
"type": "graph"
1951-
},
1952-
{
1953-
"datasource": "$datasource",
1954-
"fieldConfig": {
1955-
"defaults": {
1956-
"custom": {
1957-
"drawStyle": "line",
1958-
"fillOpacity": 10,
1959-
"lineWidth": 1,
1960-
"pointSize": 5,
1961-
"showPoints": "never",
1962-
"spanNulls": false,
1963-
"stacking": {
1964-
"group": "A",
1965-
"mode": "none"
1966-
}
1967-
},
1968-
"thresholds": {
1969-
"mode": "absolute",
1970-
"steps": [ ]
1971-
},
1972-
"unit": "ms"
1973-
},
1974-
"overrides": [ ]
1975-
},
1976-
"id": 23,
1977-
"links": [ ],
1978-
"nullPointMode": "null as zero",
1979-
"options": {
1980-
"legend": {
1981-
"showLegend": true
1982-
},
1983-
"tooltip": {
1984-
"mode": "single",
1985-
"sort": "none"
1986-
}
1987-
},
1988-
"span": 4,
1989-
"targets": [
1990-
{
1991-
"expr": "histogram_quantile(0.99, sum(rate(loki_boltdb_shipper_request_duration_seconds_bucket{namespace=\"$namespace\",job=~\".+-index-gateway-http\", operation=\"Shipper.Query\"}[$__rate_interval])) by (le)) * 1e3",
1992-
"format": "time_series",
1993-
"intervalFactor": 2,
1994-
"legendFormat": "99th Percentile",
1995-
"refId": "A",
1996-
"step": 10
1997-
},
1998-
{
1999-
"expr": "histogram_quantile(0.50, sum(rate(loki_boltdb_shipper_request_duration_seconds_bucket{namespace=\"$namespace\",job=~\".+-index-gateway-http\", operation=\"Shipper.Query\"}[$__rate_interval])) by (le)) * 1e3",
2000-
"format": "time_series",
2001-
"intervalFactor": 2,
2002-
"legendFormat": "50th Percentile",
2003-
"refId": "B",
2004-
"step": 10
2005-
},
2006-
{
2007-
"expr": "sum(rate(loki_boltdb_shipper_request_duration_seconds_sum{namespace=\"$namespace\",job=~\".+-index-gateway-http\", operation=\"Shipper.Query\"}[$__rate_interval])) * 1e3 / sum(rate(loki_boltdb_shipper_request_duration_seconds_count{namespace=\"$namespace\",job=~\".+-index-gateway-http\", operation=\"Shipper.Query\"}[$__rate_interval]))",
2008-
"format": "time_series",
2009-
"intervalFactor": 2,
2010-
"legendFormat": "Average",
2011-
"refId": "C",
2012-
"step": 10
2013-
}
2014-
],
2015-
"title": "Latency",
2016-
"type": "graph",
2017-
"yaxes": [
2018-
{
2019-
"format": "ms",
2020-
"label": null,
2021-
"logBase": 1,
2022-
"max": null,
2023-
"min": 0,
2024-
"show": true
2025-
},
2026-
{
2027-
"format": "short",
2028-
"label": null,
2029-
"logBase": 1,
2030-
"max": null,
2031-
"min": null,
2032-
"show": false
2033-
}
2034-
]
2035-
},
2036-
{
2037-
"datasource": "$datasource",
2038-
"fieldConfig": {
2039-
"defaults": {
2040-
"custom": {
2041-
"drawStyle": "line",
2042-
"fillOpacity": 10,
2043-
"lineWidth": 1,
2044-
"pointSize": 5,
2045-
"showPoints": "never",
2046-
"spanNulls": false,
2047-
"stacking": {
2048-
"group": "A",
2049-
"mode": "none"
2050-
}
2051-
},
2052-
"thresholds": {
2053-
"mode": "absolute",
2054-
"steps": [ ]
2055-
},
2056-
"unit": "ms"
2057-
},
2058-
"overrides": [ ]
2059-
},
2060-
"id": 24,
2061-
"links": [ ],
2062-
"nullPointMode": "null as zero",
2063-
"options": {
2064-
"legend": {
2065-
"showLegend": true
2066-
},
2067-
"tooltip": {
2068-
"mode": "single",
2069-
"sort": "none"
2070-
}
2071-
},
2072-
"span": 4,
2073-
"targets": [
2074-
{
2075-
"expr": "histogram_quantile(0.99, sum(rate(loki_boltdb_shipper_request_duration_seconds_bucket{namespace=\"$namespace\",job=~\".+-index-gateway-http\", operation=\"Shipper.Query\"}[$__rate_interval])) by (le,pod)) * 1e3",
2076-
"format": "time_series",
2077-
"interval": "1m",
2078-
"intervalFactor": 2,
2079-
"legendFormat": "{{pod}}",
2080-
"refId": "A",
2081-
"step": 10
2082-
}
2083-
],
2084-
"title": "Per Pod Latency (p99)",
2085-
"type": "graph"
2086-
}
2087-
],
2088-
"repeat": null,
2089-
"repeatIteration": null,
2090-
"repeatRowId": null,
2091-
"showTitle": true,
2092-
"title": "BoltDB Index",
2093-
"titleSize": "h6"
20941749
}
20951750
],
20961751
"schemaVersion": 14,

0 commit comments

Comments
 (0)