TrueCloudLab
/
frostfs-node
18
1
Fork 20
Code Issues 88 Pull Requests 7 Actions Releases Activity

Add loki #740

Merged
fyrchik merged 1 commits from achuprov/frostfs-node:loki into master 2023-11-14 19:01:06 +00:00
Conversation 1 Commits 1 Files Changed 4
achuprov commented 2023-10-14 21:27:48 +00:00
Collaborator

Related to:
TrueCloudLab/frostfs-dev-env#57
TrueCloudLab/frostfs-observability#5

Signed-off-by: Alexander Chuprov a.chuprov@yadro.com

Related to: https://git.frostfs.info/TrueCloudLab/frostfs-dev-env/pulls/57 https://git.frostfs.info/TrueCloudLab/frostfs-observability/pulls/5 Signed-off-by: Alexander Chuprov <a.chuprov@yadro.com>
achuprov force-pushed loki from 8b1120fcb6 to 0b3e1c8872 2023-10-23 08:45:29 +00:00 Compare
acid-ant reviewed 2023-10-24 06:57:26 +00:00
cmd/frostfs-node/loki.go Outdated
@ -0,0 +3,4 @@
import (
"os"
loki_config "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-node/config/loki"
acid-ant commented 2023-10-24 06:45:15 +00:00
Collaborator

loki_config -> lokiConfig

loki_config -> lokiConfig
pkg/util/logger/logger.go Outdated
@ -103,0 +108,4 @@
loki.IsEnabled,
)
l.Logger = zap.New(core)
acid-ant commented 2023-10-24 06:57:15 +00:00
Collaborator

Why not to move it in logger initialization and initialize core before l?

Why not to move it in logger initialization and initialize `core` before `l`?
achuprov force-pushed loki from 0b3e1c8872 to c0ebcefec7 2023-10-29 21:27:12 +00:00 Compare
fyrchik changed title from Add loki to WIP: Add loki 2023-10-30 07:03:07 +00:00
fyrchik commented 2023-10-30 07:03:18 +00:00
Owner

I am making it WIP until TrueCloudLab/frostfs-observability#5/ is merged

I am making it WIP until https://git.frostfs.info/TrueCloudLab/frostfs-observability/pulls/5/ is merged
achuprov force-pushed loki from c0ebcefec7 to 7c8591f83b 2023-11-02 10:49:53 +00:00 Compare
achuprov changed title from WIP: Add loki to Add loki 2023-11-02 11:04:33 +00:00
achuprov requested review from storage-core-developers 2023-11-02 11:04:48 +00:00
achuprov requested review from storage-core-committers 2023-11-02 11:05:18 +00:00
dstepanov-yadro approved these changes 2023-11-02 13:57:55 +00:00
acid-ant approved these changes 2023-11-03 08:55:44 +00:00
fyrchik reviewed 2023-11-06 06:53:48 +00:00
cmd/frostfs-node/config.go Outdated
@ -576,0 +578,4 @@
log.Core(),
loggerconfig.ToLokiConfig(appCfg),
)
log.SetCore(lokiCore)
fyrchik commented 2023-11-06 06:53:33 +00:00
Owner

We wrap our core here and then use WrapCore insideSetCore but not actually wrap anything there, it seems wrong. Do we need this SetCore at all?

We _wrap_ our core here and then use `WrapCore` inside`SetCore` but not actually wrap anything there, it seems wrong. Do we need this `SetCore` at all?
achuprov commented 2023-11-13 07:10:22 +00:00
Poster
Collaborator

fixed

fixed
fyrchik marked this conversation as resolved
achuprov force-pushed loki from b7531767e9 to b364c6dc44 2023-11-10 14:49:03 +00:00 Compare
achuprov force-pushed loki from b364c6dc44 to 08e7e76643 2023-11-10 14:52:07 +00:00 Compare
achuprov force-pushed loki from 08e7e76643 to 971746d617 2023-11-10 15:05:07 +00:00 Compare
fyrchik reviewed 2023-11-13 07:15:59 +00:00
cmd/frostfs-node/config/logger/config.go Outdated
@ -27,0 +37,4 @@
// ToLokiConfig extracts loki config.
func ToLokiConfig(c *config.Config) loki.Config {
hostname, _ := os.Hostname()
time.Sleep(time.Second * 5)
fyrchik commented 2023-11-13 07:15:07 +00:00
Owner

Why this line?

Why this line?
achuprov commented 2023-11-13 08:50:24 +00:00
Poster
Collaborator

fixed

fixed
fyrchik reviewed 2023-11-13 07:27:03 +00:00
cmd/frostfs-node/config.go Outdated
@ -580,1 +586,4 @@
)
log.Logger = log.Logger.WithOptions(zap.WrapCore(func(_ zapcore.Core) zapcore.Core {
return lokiCore
fyrchik commented 2023-11-13 07:27:03 +00:00
Owner

Now, what about using lokicore.New right inside this function? log.Core() is replaced with the argument (currently _)

Now, what about using `lokicore.New` right inside this function? `log.Core()` is replaced with the argument (currently `_`)
achuprov commented 2023-11-13 08:50:16 +00:00
Poster
Collaborator

fixed

fixed
aarifullin approved these changes 2023-11-13 08:26:51 +00:00
achuprov force-pushed loki from 971746d617 to 196cf46663 2023-11-13 08:42:47 +00:00 Compare
fyrchik merged commit 364f835b7e into master 2023-11-14 19:01:06 +00:00
fyrchik referenced this issue from a commit 2023-11-14 19:01:07 +00:00
[#740] logs: Add Loki
Sign in to join this conversation.
Reviewers
No reviewers
dstepanov-yadro
acid-ant
aarifullin
Labels
Clear labels   
P0

Highest   
P1

High   
P2

Medium   
P3

Low   
badger

Badger DB related issues   
frostfs-adm
   
frostfs-cli
   
frostfs-ir
   
frostfs-lens
   
frostfs-node
   
good first issue

Good for newcomers   
triage
  
Infrastructure

Infrastructure, Automation, CI/CD or DevOps related stuff   
blocked

The issue or PR is blocked by something   
bug

Something is not working   
config

Configuration format update or breaking change   
discussion

Talking about something in order to reach a decision or to exchange ideas   
documentation

Documentation related   
duplicate

This issue or pull request already exists   
enhancement

New feature   
go

Language features adoption   
help wanted

Extra attention is needed   
internal
   
invalid

Something is wrong   
kludge

This is a kludge and we know it   
observability

Related to metrics, tracing and logs   
perfomance

Perfomance related   
question

More information is needed   
refactoring

Refactoring   
wontfix

This won't be fixed
No Label
P0
P1
P2
P3
badger
frostfs-adm
frostfs-cli
frostfs-ir
frostfs-lens
frostfs-node
good first issue
triage
Infrastructure
blocked
bug
config
discussion
documentation
duplicate
enhancement
go
help wanted
internal
invalid
kludge
observability
perfomance
question
refactoring
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
5 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-node#740
There is no content yet.
Delete Branch "achuprov/frostfs-node:loki"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?