wn/mqtt-archiver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslog writing works

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2026-01-12 17:43:06 +01:00
parent 306535c933
commit cdf6a6c44a
7 changed files with 269 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -9,6 +9,7 @@ RUN go build -a -installsuffix nocgo -o ma main.go
FROM scratch
ENV MA_CONF ""
ENV MQTT_PASSWORD ""
COPY --from=builder /go/src/ma ./
ENTRYPOINT ["./ma"]

10
config-test.json
View File

@@ -12,5 +12,13 @@
"snmp",
"MainsCnt/#",
"cem/#"
]
],
"syslog": {
"enable": "true",
"network": "udp",
"server": "172.20.0.10:514",
"facility": "local0",
"severity": "info",
"tag": "mqtt-archiver"
}
}

10
deployment/config.json
View File

@@ -12,5 +12,13 @@
"snmp",
"MainsCnt/#",
"cem/#"
]
],
"syslog": {
"enable": "false",
"network": "udp",
"server": "syslog-server:514",
"facility": "local0",
"severity": "info",
"tag": "mqtt-archiver"
}
}

9
src/ma/archiver/archiver.go
View File

@@ -7,13 +7,14 @@ import (
)
type Message struct {
Time time.Time
Topic string
Payload string
Time time.Time `json:"time"`
Topic string `json:"topic"`
Payload string `json:"payload"`
}
func InitArchiver() {
log.Printf("Archiver initializing")
InitSyslog()
}
func InputArchiver() {
@@ -25,4 +26,6 @@ func InputArchiver() {
func handleMessage(message Message) {
log.Printf("Archiving Timestamp: %s, Topic: %s, Payload: %s", message.Time, message.Topic, message.Payload)
WriteSyslog(message)
}

115
src/ma/archiver/syslog.go Normal file
View File

@@ -0,0 +1,115 @@
package archiver
import (
"encoding/json"
"log"
"log/syslog"
"ma/config"
)
var syslogWriter *syslog.Writer
func InitSyslog() {
if config.Config.Syslog.Enable == "true" {
// Parse facility
facility := parseFacility(config.Config.Syslog.Facility)
// Parse severity
severity := parseSeverity(config.Config.Syslog.Severity)
// Combine to priority
priority := facility | severity
var err error
syslogWriter, err = syslog.Dial(
config.Config.Syslog.Network,
config.Config.Syslog.Server,
priority,
config.Config.Syslog.Tag,
)
if err != nil {
log.Fatalf("Failed to connect to syslog server: %v", err)
}
log.Printf("Syslog connection established: %s://%s", config.Config.Syslog.Network, config.Config.Syslog.Server)
}
}
func WriteSyslog(message Message) {
if syslogWriter != nil {
jsonData, err := json.Marshal(message)
if err != nil {
log.Printf("Failed to marshal message to JSON: %v", err)
return
}
// Send to syslog based on configured severity
switch config.Config.Syslog.Severity {
case "emerg":
syslogWriter.Emerg(string(jsonData))
case "alert":
syslogWriter.Alert(string(jsonData))
case "crit":
syslogWriter.Crit(string(jsonData))
case "err":
syslogWriter.Err(string(jsonData))
case "warning":
syslogWriter.Warning(string(jsonData))
case "notice":
syslogWriter.Notice(string(jsonData))
case "info":
syslogWriter.Info(string(jsonData))
case "debug":
syslogWriter.Debug(string(jsonData))
default:
syslogWriter.Info(string(jsonData))
}
}
}
func parseFacility(facility string) syslog.Priority {
facilities := map[string]syslog.Priority{
"kern": syslog.LOG_KERN,
"user": syslog.LOG_USER,
"mail": syslog.LOG_MAIL,
"daemon": syslog.LOG_DAEMON,
"auth": syslog.LOG_AUTH,
"syslog": syslog.LOG_SYSLOG,
"lpr": syslog.LOG_LPR,
"news": syslog.LOG_NEWS,
"uucp": syslog.LOG_UUCP,
"cron": syslog.LOG_CRON,
"authpriv": syslog.LOG_AUTHPRIV,
"ftp": syslog.LOG_FTP,
"local0": syslog.LOG_LOCAL0,
"local1": syslog.LOG_LOCAL1,
"local2": syslog.LOG_LOCAL2,
"local3": syslog.LOG_LOCAL3,
"local4": syslog.LOG_LOCAL4,
"local5": syslog.LOG_LOCAL5,
"local6": syslog.LOG_LOCAL6,
"local7": syslog.LOG_LOCAL7,
}
if f, ok := facilities[facility]; ok {
return f
}
return syslog.LOG_LOCAL0 // Default
}
func parseSeverity(severity string) syslog.Priority {
severities := map[string]syslog.Priority{
"emerg": syslog.LOG_EMERG,
"alert": syslog.LOG_ALERT,
"crit": syslog.LOG_CRIT,
"err": syslog.LOG_ERR,
"warning": syslog.LOG_WARNING,
"notice": syslog.LOG_NOTICE,
"info": syslog.LOG_INFO,
"debug": syslog.LOG_DEBUG,
}
if s, ok := severities[severity]; ok {
return s
}
return syslog.LOG_INFO // Default
}

18
src/ma/config/config.go
View File

@@ -1,8 +1,10 @@
package config
import "encoding/json"
import "log"
import "os"
import (
"encoding/json"
"log"
"os"
)
type HandlerConfigT struct {
Attributes map[string]string `json:"attributes"`
@@ -17,11 +19,18 @@ type ConfigT struct {
} `json:"mqtt"`
IncludeTopics []string `json:"includeTopics"`
ExcludeTopics []string `json:"excludeTopics"`
Syslog struct {
Enable string `json:"enable"`
Network string `json:"network"`
Server string `json:"server"`
Facility string `json:"facility"`
Severity string `json:"severity"`
Tag string `json:"tag"`
} `json:"syslog"`
}
var Config ConfigT
func LoadConfiguration() {
err := json.Unmarshal([]byte(os.Getenv("MA_CONF")), &Config)
if err != nil {
@@ -30,4 +39,3 @@ func LoadConfiguration() {
Config.Mqtt.Password = os.Getenv("MQTT_PASSWORD")
}

31
src/ma/mqtt/mqtt.go
View File

@@ -1,13 +1,17 @@
package mqtt
import "log"
import "strings"
import "fmt"
import MQTT "github.com/eclipse/paho.mqtt.golang"
import "github.com/google/uuid"
import "crypto/tls"
import "ma/config"
import "ma/counter"
import (
"fmt"
"log"
"strings"
"crypto/tls"
"ma/config"
"ma/counter"
MQTT "github.com/eclipse/paho.mqtt.golang"
"github.com/google/uuid"
)
type Message struct {
Topic string
@@ -22,7 +26,7 @@ var mqttClient MQTT.Client
func onMessageReceived(client MQTT.Client, message MQTT.Message) {
//log.Printf("Message received, topic: %s, payload: %s\n", message.Topic(), message.Payload())
m := Message {
m := Message{
Topic: message.Topic(),
Payload: message.Payload(),
Retained: message.Retained(),
@@ -57,7 +61,6 @@ func onReconnecting(client MQTT.Client, clientOpts *MQTT.ClientOptions) {
log.Println("Oops, connection lost, already reconnecting ...")
}
func onConnect(client MQTT.Client) {
for _, topic := range config.Config.IncludeTopics {
if token := client.Subscribe(topic, 0, onMessageReceived); token.Wait() && token.Error() != nil {
@@ -68,16 +71,13 @@ func onConnect(client MQTT.Client) {
}
func outputDispatcher(client MQTT.Client) {
for {
select {
case message := <- OutputChannel:
for message := range OutputChannel {
log.Printf("Message arrived in outputDispatcher, topic: %s, payload: %s\n", message.Topic, message.Payload)
if token := client.Publish(message.Topic, 0, false, message.Payload); token.Wait() && token.Error() != nil {
log.Printf("Unable to publish, error %s", token.Error())
}
log.Println("Successfully published")
}
}
}
func StartMqttClient() {
@@ -111,7 +111,7 @@ func StartMqttClient() {
enableTls := config.Config.Mqtt.TlsEnable
if enableTls == "true" {
//log.Println("Enabling TLS connection")
tlsConfig := &tls.Config {
tlsConfig := &tls.Config{
InsecureSkipVerify: true,
}
opts.SetTLSConfig(tlsConfig)
@@ -152,4 +152,3 @@ func TopicMatchesSubscription(topic, subscription string) bool {
return true
}