mirror of https://github.com/0xERR0R/blocky.git
chore: change branch name to "main" (#744)
This commit is contained in:
parent
88de7c16f7
commit
2c108dabb8
|
@ -13,10 +13,10 @@ name: "CodeQL"
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master ]
|
branches: [ main ]
|
||||||
pull_request:
|
pull_request:
|
||||||
# The branches below must be a subset of the branches above
|
# The branches below must be a subset of the branches above
|
||||||
branches: [ master ]
|
branches: [ main ]
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '33 15 * * 1'
|
- cron: '33 15 * * 1'
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ name: Development docker build
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- main
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
security-events: write
|
security-events: write
|
||||||
|
|
|
@ -3,7 +3,7 @@ on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- docs
|
- docs
|
||||||
- master
|
- main
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
[![Donation](https://img.shields.io/badge/buy%20me%20a%20coffee-donate-blueviolet.svg)](https://ko-fi.com/0xerr0r)
|
[![Donation](https://img.shields.io/badge/buy%20me%20a%20coffee-donate-blueviolet.svg)](https://ko-fi.com/0xerr0r)
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<img height="200" src="https://github.com/0xERR0R/blocky/blob/master/docs/blocky.svg">
|
<img height="200" src="https://github.com/0xERR0R/blocky/blob/main/docs/blocky.svg">
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
# Blocky
|
# Blocky
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Blocky
|
# Blocky
|
||||||
|
|
||||||
<figure>
|
<figure>
|
||||||
<img src="https://raw.githubusercontent.com/0xERR0R/blocky/master/docs/blocky.svg" width="200" />
|
<img src="https://raw.githubusercontent.com/0xERR0R/blocky/main/docs/blocky.svg" width="200" />
|
||||||
</figure>
|
</figure>
|
||||||
|
|
||||||
Blocky is a DNS proxy and ad-blocker for the local network written in Go with following features:
|
Blocky is a DNS proxy and ad-blocker for the local network written in Go with following features:
|
||||||
|
|
|
@ -25,7 +25,7 @@ Following metrics will be exported:
|
||||||
### Grafana dashboard
|
### Grafana dashboard
|
||||||
|
|
||||||
Example [Grafana](https://grafana.com/) dashboard
|
Example [Grafana](https://grafana.com/) dashboard
|
||||||
definition [as JSON](https://github.com/0xERR0R/blocky/blob/master/docs/blocky-grafana.json)
|
definition [as JSON](https://github.com/0xERR0R/blocky/blob/main/docs/blocky-grafana.json)
|
||||||
or [at grafana.com](https://grafana.com/grafana/dashboards/13768)
|
or [at grafana.com](https://grafana.com/grafana/dashboards/13768)
|
||||||
![grafana-dashboard](grafana-dashboard.png).
|
![grafana-dashboard](grafana-dashboard.png).
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ blocky, prometheus (with configured scraper for blocky) and grafana with prometh
|
||||||
## MySQL / MariaDB
|
## MySQL / MariaDB
|
||||||
|
|
||||||
If database query logging is activated (see [Query logging](configuration.md#query-logging)), you can use following
|
If database query logging is activated (see [Query logging](configuration.md#query-logging)), you can use following
|
||||||
Grafana Dashboard [as JSON](https://github.com/0xERR0R/blocky/blob/master/docs/blocky-query-grafana.json)
|
Grafana Dashboard [as JSON](https://github.com/0xERR0R/blocky/blob/main/docs/blocky-query-grafana.json)
|
||||||
or [at grafana.com](https://grafana.com/grafana/dashboards/14980)
|
or [at grafana.com](https://grafana.com/grafana/dashboards/14980)
|
||||||
|
|
||||||
![grafana-dashboard](grafana-query-dashboard.png).
|
![grafana-dashboard](grafana-query-dashboard.png).
|
||||||
|
@ -54,6 +54,6 @@ Please define the MySQL source in Grafana, which points to the database with blo
|
||||||
|
|
||||||
## Postgres
|
## Postgres
|
||||||
|
|
||||||
The JSON for a Grafana dashboard equivalent to the MySQL/MariaDB version is located [here](https://github.com/0xERR0R/blocky/blob/master/docs/blocky-query-grafana-postgres.json)
|
The JSON for a Grafana dashboard equivalent to the MySQL/MariaDB version is located [here](https://github.com/0xERR0R/blocky/blob/main/docs/blocky-query-grafana-postgres.json)
|
||||||
|
|
||||||
--8<-- "docs/includes/abbreviations.md"
|
--8<-- "docs/includes/abbreviations.md"
|
||||||
|
|
|
@ -264,7 +264,7 @@ func configureRootHandler(cfg *config.Config, router *chi.Mux) {
|
||||||
Title string
|
Title string
|
||||||
}
|
}
|
||||||
|
|
||||||
swaggerVersion := "master"
|
swaggerVersion := "main"
|
||||||
if util.Version != "undefined" {
|
if util.Version != "undefined" {
|
||||||
swaggerVersion = util.Version
|
swaggerVersion = util.Version
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue