From 0b4a8d2c363b93c239cd75c70c46601b8ed94eb9 Mon Sep 17 00:00:00 2001 From: bakraw Date: Wed, 15 May 2024 17:07:58 +0200 Subject: [PATCH 01/10] Ajout support utilisateurs grafana --- src/mikromap-api/main.go | 44 ++++++++++---- src/mikromap-cli/main.go | 121 +++++++++++++++++++++------------------ 2 files changed, 98 insertions(+), 67 deletions(-) diff --git a/src/mikromap-api/main.go b/src/mikromap-api/main.go index a560940..8d0e884 100644 --- a/src/mikromap-api/main.go +++ b/src/mikromap-api/main.go @@ -1,4 +1,3 @@ -// Dernière mise à jour: avril 2024 package main import ( @@ -14,12 +13,14 @@ import ( probing "github.com/prometheus-community/pro-bing" ) +// Structure routers.json type Router struct { - IP string `json:"ip"` - Lat float64 `json:"lat"` - Lon float64 `json:"lon"` - Adresse string `json:"adresse"` - Statut int `json:"statut"` + IP string `json:"ip"` + Lat float64 `json:"lat"` + Lon float64 `json:"lon"` + Adresse string `json:"adresse"` + Username string `json:"username"` + Statut int `json:"statut"` } // Renvoie le chemin vers le fichier JSON. @@ -72,14 +73,33 @@ func writeJSON(data []Router) { } // Traite les requêtes HTTP GET. -// Renvoie simplement le contenu de routers.json +// Renvoie le contenu de routers.json qui concerne l'utilisateur Grafana qui fait le call. // Prend en entrée un http.responseWriter et une http.Request. // Ne devrait être appelée que via HandleFunc(). -func getRoot(w http.ResponseWriter, r *http.Request) { +func getMikromap(w http.ResponseWriter, r *http.Request) { - json.NewEncoder(w).Encode(readJSON()) + // Récupération du nom d'utilisateur transmis par Grafana + user := r.URL.Query().Get("user") - fmt.Printf("Got GET request on /\n") + fmt.Printf("Requête GET entrante sur /mikromap (user = %s)\n", user) + + // Récupération routers.json dans un struct + dataRouters := readJSON() + + // Suppression dans le struct de tous les routeurs dont le Username n'est pas identique au paramètre reçu. + // Si le paramètre vaut admin, on saute cette étape. + if user != "admin" { + // On parcourt le slice dans le sens inverse pour ne pas modifier des éléments pas encore parcourus. + for i := len(dataRouters) - 1; i >= 0; i-- { + v := dataRouters[i] + if v.Username != user { + dataRouters = append(dataRouters[0:i], dataRouters[i+1:]...) + } + } + } + + // Envoi du struct modifié + json.NewEncoder(w).Encode(dataRouters) } // Traite les requêtes HTTP entrantes. @@ -88,9 +108,9 @@ func getRoot(w http.ResponseWriter, r *http.Request) { func handleRequests() { router := mux.NewRouter().StrictSlash(true) - router.HandleFunc("/", getRoot) + router.HandleFunc("/mikromap", getMikromap) - log.Fatal(http.ListenAndServe("localhost:3333", router)) + log.Fatal(http.ListenAndServe(":3333", router)) } // Ping une adresse IP pour vérifier son état. diff --git a/src/mikromap-cli/main.go b/src/mikromap-cli/main.go index e0a1631..3d5b478 100644 --- a/src/mikromap-cli/main.go +++ b/src/mikromap-cli/main.go @@ -15,11 +15,12 @@ import ( // Structure routers.json type Router struct { - IP string `json:"ip"` - Lat float64 `json:"lat"` - Lon float64 `json:"lon"` - Adresse string `json:"adresse"` - Statut int `json:"statut"` + IP string `json:"ip"` + Lat float64 `json:"lat"` + Lon float64 `json:"lon"` + Adresse string `json:"adresse"` + Username string `json:"username"` + Statut int `json:"statut"` } // Structure prometheus_targets.json @@ -188,12 +189,36 @@ func writePromTargets(data []PromTargets, target string) { // Ne prend rien en entrée et ne renvoie rien. func addRouter() { - var addrPost string - var addrIP string + var addrPost, addrIP, username string var isWatchguard bool = false + // Lecture fichiers + dataRouters := readJSON() + dataGlobal := readPromTargets("global_targets.json") + dataMikrotik := readPromTargets("mikrotik_targets.json") + fmt.Println("--- Ajouter un routeur à la supervision") + // Récupération adresse IP + fmt.Print("Adresse IP >> ") + _, err := fmt.Scanln(&addrIP) + if err != nil { + log.Fatalf("--- Erreur lors de la récupération de la saisie:\n%s", err) + } + + // Vérification IP déjà enregistrée + for _, v := range dataRouters { + if v.IP == addrIP { + log.Fatal("--- Erreur: cette adresse IP existe déjà.") + } + } + + // Vérification et supression préfixe "W" pour Watchguard + if strings.HasPrefix(addrIP, "W") { + isWatchguard = true + addrIP = strings.TrimLeft(addrIP, "W") + } + // Récupération adresse postale fmt.Print("Adresse postale >> ") scanner := bufio.NewScanner(os.Stdin) @@ -209,49 +234,33 @@ func addRouter() { lat, lon, adresse := extractCoords(resBody) fmt.Printf("- %s\n- %f, %f\n", adresse, lat, lon) - // Récupération adresse IP - fmt.Print("Adresse IP >> ") - _, err := fmt.Scanln(&addrIP) - if err != nil { - log.Fatalf("--- Erreur lors de la récupération de la saisie:\n%s", err) - } - - // Vérification et supression préfixe "W" pour Watchguard - if strings.HasPrefix(addrIP, "W") { - isWatchguard = true - addrIP = strings.TrimLeft(addrIP, "W") + // Récupération entreprise + fmt.Print("Utilisateur Grafana associé >>> ") + if scanner.Scan() { + username = scanner.Text() } // Ajout d'un nouveau routeur dans routers.json - dataR := readJSON() - - for _, v := range dataR { - if v.IP == addrIP { - log.Fatal("--- Erreur: cette adresse IP existe déjà.") - } - } - newRouter := Router{ - IP: addrIP, - Lat: lat, - Lon: lon, - Adresse: adresse, - Statut: 0, + IP: addrIP, + Lat: lat, + Lon: lon, + Adresse: adresse, + Username: username, + Statut: 0, } - dataR = append(dataR, newRouter) - writeJSON(dataR) + dataRouters = append(dataRouters, newRouter) + writeJSON(dataRouters) // Ajout IP au job commun à tous les appareils - dataM := readPromTargets("global_targets.json") - dataM[0].Targets = append(dataM[0].Targets, addrIP) - writePromTargets(dataM, "global_targets.json") + dataGlobal[0].Targets = append(dataGlobal[0].Targets, addrIP) + writePromTargets(dataGlobal, "global_targets.json") // Si l'adresse IP n'est pas associée à un Watchguard, l'ajouter au job spécifique aux Mikrotiks. if !isWatchguard { - dataP := readPromTargets("mikrotik_targets.json") - dataP[0].Targets = append(dataP[0].Targets, addrIP) - writePromTargets(dataP, "mikrotik_targets.json") + dataMikrotik[0].Targets = append(dataMikrotik[0].Targets, addrIP) + writePromTargets(dataMikrotik, "mikrotik_targets.json") } fmt.Println("--- Routeur ajouté") @@ -262,6 +271,11 @@ func addRouter() { func removeRouter() { var addrIP string + // Lecture fichiers + dataRouters := readJSON() + dataGlobal := readPromTargets("global_targets.json") + dataMikrotik := readPromTargets("mikrotik_targets.json") + fmt.Println("--- Retirer un routeur de la supervision") // Récupération adresse IP @@ -271,33 +285,29 @@ func removeRouter() { log.Fatalf("--- Erreur lors de la récupération de la saisie:\n%s", err) } - dataR := readJSON() - dataM := readPromTargets("global_targets.json") - dataP := readPromTargets("mikrotik_targets.json") - - // Suppression du struct dataR puis écriture de routers.json - for i, v := range dataR { + // Suppression de l'élément du struct dataRouters puis écriture de routers.json + for i, v := range dataRouters { if v.IP == addrIP { - dataR = append(dataR[0:i], dataR[i+1:]...) + dataRouters = append(dataRouters[0:i], dataRouters[i+1:]...) } } - writeJSON(dataR) + writeJSON(dataRouters) - // Suppression du struct dataM puis écriture de global_targets.json - for i, v := range dataM[0].Targets { + // Suppression de l'élément du struct dataGlobal puis écriture de global_targets.json + for i, v := range dataGlobal[0].Targets { if v == addrIP { - dataM[0].Targets = append(dataM[0].Targets[0:i], dataM[0].Targets[i+1:]...) + dataGlobal[0].Targets = append(dataGlobal[0].Targets[0:i], dataGlobal[0].Targets[i+1:]...) } } - writePromTargets(dataM, "global_targets.json") + writePromTargets(dataGlobal, "global_targets.json") - // Suppression du struct dataP puis écriture de mikrotik_targets.json - for i, v := range dataP[0].Targets { + // Suppression de l'élément du struct dataMikrotik puis écriture de mikrotik_targets.json + for i, v := range dataMikrotik[0].Targets { if v == addrIP { - dataP[0].Targets = append(dataP[0].Targets[0:i], dataP[0].Targets[i+1:]...) + dataMikrotik[0].Targets = append(dataMikrotik[0].Targets[0:i], dataMikrotik[0].Targets[i+1:]...) } } - writePromTargets(dataP, "mikrotik_targets.json") + writePromTargets(dataMikrotik, "mikrotik_targets.json") fmt.Println("--- Routeur supprimé") } @@ -305,6 +315,7 @@ func removeRouter() { func main() { var n int + fmt.Print("Nombre de routeurs à ajouter >>> ") _, err := fmt.Scanln(&n) if err != nil { From 9700a072d9f375c4883b88568c0c5d3a083ec7c2 Mon Sep 17 00:00:00 2001 From: bakraw Date: Wed, 15 May 2024 17:09:04 +0200 Subject: [PATCH 02/10] conf/snmp_config.yml --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8b13789..da22fd0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ - +conf/snmp_config.yml From b078ecec408d07be0213780e1943dd99c93aba4d Mon Sep 17 00:00:00 2001 From: bakraw Date: Wed, 15 May 2024 17:09:34 +0200 Subject: [PATCH 03/10] Ajout fichier config du serveur Grafana --- conf/defaults.ini | 1828 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1828 insertions(+) create mode 100644 conf/defaults.ini diff --git a/conf/defaults.ini b/conf/defaults.ini new file mode 100644 index 0000000..5cf2c9a --- /dev/null +++ b/conf/defaults.ini @@ -0,0 +1,1828 @@ +# Backup conf/defaults.ini dans le dossier de Grafana puis le remplacer par celui-ci + +##################### Grafana Configuration Defaults ##################### +# +# Do not modify this file in grafana installs +# + +# possible values : production, development +app_mode = production + +# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty +instance_name = ${HOSTNAME} + +# force migration will run migrations that might cause dataloss +# Deprecated, use clean_upgrade option in [unified_alerting.upgrade] instead. +force_migration = false + +#################################### Paths ############################### +[paths] +# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used) +data = data + +# Temporary files in `data` directory older than given duration will be removed +temp_data_lifetime = 24h + +# Directory where grafana can store logs +logs = data/log + +# Directory where grafana will automatically scan and look for plugins +plugins = data/plugins + +# folder that contains provisioning config files that grafana will apply on startup and while running. +provisioning = conf/provisioning + +#################################### Server ############################## +[server] +# Protocol (http, https, h2, socket) +protocol = http + +# Minimum TLS version allowed. By default, this value is empty. Accepted values are: TLS1.2, TLS1.3. If nothing is set TLS1.2 would be taken +min_tls_version = "" + +# The ip address to bind to, empty will bind to all interfaces +http_addr = + +# The http port to use +http_port = 3000 + +# The public facing domain name used to access grafana from a browser +domain = localhost + +# Redirect to correct domain if host header does not match domain +# Prevents DNS rebinding attacks +enforce_domain = false + +# The full public facing url +root_url = %(protocol)s://%(domain)s:%(http_port)s/ + +# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons. +serve_from_sub_path = false + +# Log web requests +router_logging = false + +# the path relative working path +static_root_path = public + +# enable gzip +enable_gzip = false + +# https certs & key file +cert_file = +cert_key = + +# Unix socket gid +# Changing the gid of a file without privileges requires that the target group is in the group of the process and that the process is the file owner +# It is recommended to set the gid as http server user gid +# Not set when the value is -1 +socket_gid = -1 + +# Unix socket mode +socket_mode = 0660 + +# Unix socket path +socket = /tmp/grafana.sock + +# CDN Url +cdn_url = + +# Sets the maximum time in minutes before timing out read of an incoming request and closing idle connections. +# `0` means there is no timeout for reading the request. +read_timeout = 0 + +# This setting enables you to specify additional headers that the server adds to HTTP(S) responses. +[server.custom_response_headers] +#exampleHeader1 = exampleValue1 +#exampleHeader2 = exampleValue2 + +#################################### GRPC Server ######################### +[grpc_server] +network = "tcp" +address = "127.0.0.1:10000" +use_tls = false +cert_file = +key_file = + +#################################### Database ############################ +[database] +# You can configure the database connection by specifying type, host, name, user and password +# as separate properties or as on string using the url property. + +# Either "mysql", "postgres" or "sqlite3", it's your choice +type = sqlite3 +host = 127.0.0.1:3306 +name = grafana +user = root +# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;""" +password = +# Use either URL or the previous fields to configure the database +# Example: mysql://user:secret@host:port/database +url = + +# Max idle conn setting default is 2 +max_idle_conn = 2 + +# Max conn setting default is 0 (mean not set) +max_open_conn = + +# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours) +conn_max_lifetime = 14400 + +# Set to true to log the sql calls and execution times. +log_queries = + +# For "postgres", use either "disable", "require" or "verify-full" +# For "mysql", use either "true", "false", or "skip-verify". +ssl_mode = disable + +# For "postregs", use either "1" to enable or "0" to disable SNI +ssl_sni = + +# Database drivers may support different transaction isolation levels. +# Currently, only "mysql" driver supports isolation levels. +# If the value is empty - driver's default isolation level is applied. +# For "mysql" use "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE". +isolation_level = + +ca_cert_path = +client_key_path = +client_cert_path = +server_cert_name = + +# For "sqlite3" only, path relative to data_path setting +path = grafana.db + +# For "sqlite3" only. cache mode setting used for connecting to the database +cache_mode = private + +# For "sqlite3" only. Enable/disable Write-Ahead Logging, https://sqlite.org/wal.html. Default is false. +wal = false + +# For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0. +locking_attempt_timeout_sec = 0 + +# For "sqlite" only. How many times to retry query in case of database is locked failures. Default is 0 (disabled). +query_retries = 0 + +# For "sqlite" only. How many times to retry transaction in case of database is locked failures. Default is 5. +transaction_retries = 5 + +# Set to true to add metrics and tracing for database queries. +instrument_queries = false + +#################################### Cache server ############################# +[remote_cache] +# Either "redis", "memcached" or "database" default is "database" +type = database + +# cache connectionstring options +# database: will use Grafana primary database. +# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'. +# memcache: 127.0.0.1:11211 +connstr = + +# prefix prepended to all the keys in the remote cache +prefix = + +# This enables encryption of values stored in the remote cache +encryption = + +#################################### Data proxy ########################### +[dataproxy] + +# This enables data proxy logging, default is false +logging = false + +# How long the data proxy waits to read the headers of the response before timing out, default is 30 seconds. +# This setting also applies to core backend HTTP data sources where query requests use an HTTP client with timeout set. +timeout = 30 + +# How long the data proxy waits to establish a TCP connection before timing out, default is 10 seconds. +dialTimeout = 10 + +# How many seconds the data proxy waits before sending a keepalive request. +keep_alive_seconds = 30 + +# How many seconds the data proxy waits for a successful TLS Handshake before timing out. +tls_handshake_timeout_seconds = 10 + +# How many seconds the data proxy will wait for a server's first response headers after +# fully writing the request headers if the request has an "Expect: 100-continue" +# header. A value of 0 will result in the body being sent immediately, without +# waiting for the server to approve. +expect_continue_timeout_seconds = 1 + +# Optionally limits the total number of connections per host, including connections in the dialing, +# active, and idle states. On limit violation, dials will block. +# A value of zero (0) means no limit. +max_conns_per_host = 0 + +# The maximum number of idle connections that Grafana will keep alive. +max_idle_connections = 100 + +# How many seconds the data proxy keeps an idle connection open before timing out. +idle_conn_timeout_seconds = 90 + +# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request. +send_user_header = false + +# Limit the amount of bytes that will be read/accepted from responses of outgoing HTTP requests. +response_limit = 0 + +# Limits the number of rows that Grafana will process from SQL data sources. +row_limit = 1000000 + +# Sets a custom value for the `User-Agent` header for outgoing data proxy requests. If empty, the default value is `Grafana/` (for example `Grafana/9.0.0`). +user_agent = + +#################################### Analytics ########################### +[analytics] +# Server reporting, sends usage counters to stats.grafana.org every 24 hours. +# No ip addresses are being tracked, only simple counters to track +# running instances, dashboard and error counts. It is very helpful to us. +# Change this option to false to disable reporting. +reporting_enabled = true + +# The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs +reporting_distributor = grafana-labs + +# Set to false to disable all checks to https://grafana.com +# for new versions of grafana. The check is used +# in some UI views to notify that a grafana update exists. +# This option does not cause any auto updates, nor send any information +# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version. +check_for_updates = true + +# Set to false to disable all checks to https://grafana.com +# for new versions of plugins. The check is used +# in some UI views to notify that a plugin update exists. +# This option does not cause any auto updates, nor send any information +# only a GET request to https://grafana.com to get the latest versions. +check_for_plugin_updates = true + +# Google Analytics universal tracking code, only enabled if you specify an id here +google_analytics_ua_id = + +# Google Analytics 4 tracking code, only enabled if you specify an id here +google_analytics_4_id = + +# When Google Analytics 4 Enhanced event measurement is enabled, we will try to avoid sending duplicate events and let Google Analytics 4 detect navigation changes, etc. +google_analytics_4_send_manual_page_views = false + +# Google Tag Manager ID, only enabled if you specify an id here +google_tag_manager_id = + +# Rudderstack write key, enabled only if rudderstack_data_plane_url is also set +rudderstack_write_key = + +# Rudderstack data plane url, enabled only if rudderstack_write_key is also set +rudderstack_data_plane_url = + +# Rudderstack SDK url, optional, only valid if rudderstack_write_key and rudderstack_data_plane_url is also set +rudderstack_sdk_url = + +# Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config +rudderstack_config_url = + +# Rudderstack Integrations URL, optional. Only valid if you pass the SDK version 1.1 or higher +rudderstack_integrations_url = + +# Intercom secret, optional, used to hash user_id before passing to Intercom via Rudderstack +intercom_secret = + +# Application Insights connection string. Specify an URL string to enable this feature. +application_insights_connection_string = + +# Optional. Specifies an Application Insights endpoint URL where the endpoint string is wrapped in backticks ``. +application_insights_endpoint_url = + +# Controls if the UI contains any links to user feedback forms +feedback_links_enabled = true + +#################################### Security ############################ +[security] +# disable creation of admin user on first start of grafana +disable_initial_admin_creation = false + +# default admin user, created on startup +admin_user = admin + +# default admin password, can be changed before first start of grafana, or in profile settings +admin_password = admin + +# default admin email, created on startup +admin_email = admin@localhost + +# used for signing +secret_key = SW2YcwTIb9zpOOhoPsMm + +# current key provider used for envelope encryption, default to static value specified by secret_key +encryption_provider = secretKey.v1 + +# list of configured key providers, space separated (Enterprise only): e.g., awskms.v1 azurekv.v1 +available_encryption_providers = + +# disable gravatar profile images +disable_gravatar = false + +# data source proxy whitelist (ip_or_domain:port separated by spaces) +data_source_proxy_whitelist = + +# disable protection against brute force login attempts +disable_brute_force_login_protection = false + +# set to true if you host Grafana behind HTTPS. default is false. +cookie_secure = false + +# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict", "none" and "disabled" +cookie_samesite = lax + +# set to true if you want to allow browsers to render Grafana in a ,