starred/openobserve
1
0
Fork 0
mirror of https://github.com/openobserve/openobserve.git synced 2026-11-04 16:09:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ingestion page (#91)

Browse Source
This commit is contained in:
Hengfei Yang
2023-02-16 20:09:54 +08:00
committed by GitHub
parent 562648527e
commit b981ede0e7
12 changed files with 88 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/package-lock.json
Generated
+1 -1
View File
@@ -16,7 +16,7 @@
"@segment/analytics-next": "^1.45.0",
"@sentry/tracing": "^7.17.4",
"@sentry/vue": "^7.17.4",
"aws-amplify": "*",
"aws-amplify": "latest",
"js-cookie": "^3.0.1",
"jwt-decode": "^3.1.2",
"lodash-es": "^4.17.21",
web/package.json
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "zinc-oxide-web",
"version": "0.0.0",
"name": "zinc-observe-web",
"version": "0.1.0",
"license": "Apache-2.0",
"private": true,
"scripts": {
@@ -24,7 +24,7 @@
"@segment/analytics-next": "^1.45.0",
"@sentry/tracing": "^7.17.4",
"@sentry/vue": "^7.17.4",
"aws-amplify": "latest",
"aws-amplify": "4.3.43",
"js-cookie": "^3.0.1",
"jwt-decode": "^3.1.2",
"lodash-es": "^4.17.21",
web/src/components/ingestion/Curl.vue
+13 -4
View File
@@ -29,10 +29,8 @@
</div>
</div>
<pre ref="content">
curl -u {{ currUserEmail }}:{{ store.state.organizationPasscode }} -k {{
config.zincENLIngestion
}}/api/{{ currOrgIdentifier }}/default/_json -d [JSON-DATA]</pre
>
curl -u {{ currUserEmail }}:{{ store.state.organizationPasscode }} -k {{ endpoint.url }}/api/{{ currOrgIdentifier }}/default/_json -d [JSON-DATA]
</pre>
</div>
</template>
@@ -53,11 +51,22 @@ export default defineComponent({
},
setup() {
const store = useStore();
const endpoint = ref("");
const url = new URL(store.state.API_ENDPOINT);
endpoint.value = {
url: store.state.API_ENDPOINT,
host: url.hostname,
port: url.port,
protocol: url.protocol.replace(":", ""),
tls: url.protocol === "https:" ? "On" : "Off",
};
const content = ref(null);
return {
store,
config,
endpoint,
content,
};
},
web/src/components/ingestion/FluentBit.vue
+18 -8
View File
@@ -33,15 +33,14 @@
Name http
Match *
Path /api/{{ currOrgIdentifier }}/default/_json
Host {{ config.zincENLIngestion }}
index default
Port 443
tls On
Suppress_Type_Name On
Generate_ID On
Host {{ endpoint.host }}
Port {{ endpoint.port }}
tls {{ endpoint.tls }}
Format json
Json_date_key _timestamp
Json_date_format iso8601
HTTP_User {{ currUserEmail }}
HTTP_Passwd {{ store.state.organizationPasscode }}</pre
>
HTTP_Passwd {{ store.state.organizationPasscode }}</pre>
</div>
</template>
@@ -62,11 +61,22 @@ export default defineComponent({
},
setup() {
const store = useStore();
const endpoint = ref("");
const url = new URL(store.state.API_ENDPOINT);
endpoint.value = {
url: store.state.API_ENDPOINT,
host: url.hostname,
port: url.port,
protocol: url.protocol.replace(":", ""),
tls: url.protocol === "https:" ? "On" : "Off",
};
const fluentbitContent = ref(null);
return {
store,
config,
endpoint,
fluentbitContent,
};
},
web/src/components/ingestion/Fluentd.vue
+20 -12
View File
@@ -36,19 +36,16 @@
&lt;/source&gt;
&lt;match **&gt;
@type copy
&lt;store&gt;
@type http
host {{ config.zincENLIngestion }}
port 443
scheme https
path /api/{{ currOrgIdentifier }}/default/_json
user {{ currUserEmail }}
@type http
endpoint {{ endpoint.url }}/api/{{ currOrgIdentifier }}/default/_json
content_type json
json_array true
&lt;auth&gt;
method basic
username {{ currUserEmail }}
password {{ store.state.organizationPasscode }}
index_name default
&lt;/store&gt;
&lt;/match&gt;</pre
>
&lt;/auth&gt;
&lt;/match&gt;</pre>
</div>
</template>
@@ -69,11 +66,22 @@ export default defineComponent({
},
setup() {
const store = useStore();
const endpoint = ref("");
const url = new URL(store.state.API_ENDPOINT);
endpoint.value = {
url: store.state.API_ENDPOINT,
host: url.hostname,
port: url.port,
protocol: url.protocol.replace(":", ""),
tls: url.protocol === "https:" ? "On" : "Off",
};
const fluentdContent = ref(null);
return {
store,
config,
endpoint,
fluentdContent,
};
},
web/src/components/ingestion/Vector.vue
+15 -5
View File
@@ -32,15 +32,14 @@
[sinks.zinc]
type = "http"
inputs = [ source or transform id ]
endpoint = "{{ config.zincENLEndPoint }}/api/{{ currOrgIdentifier }}/"
mode = "bulk"
endpoint = "{{ endpoint.url }}/api/{{ currOrgIdentifier }}/default/_json"
auth.strategy = "basic"
auth.user = "{{ currUserEmail }}"
auth.password = "{{ store.state.organizationPasscode }}"
bulk.index = "default"
compression = "none"
healthcheck.enabled = false</pre
>
encoding.codec = "json"
encoding.timestamp_format = "rfc3339"
healthcheck.enabled = false</pre>
</div>
</template>
@@ -61,11 +60,22 @@ export default defineComponent({
},
setup() {
const store = useStore();
const endpoint = ref("");
const url = new URL(store.state.API_ENDPOINT);
endpoint.value = {
url: store.state.API_ENDPOINT,
host: url.hostname,
port: url.port,
protocol: url.protocol.replace(":", ""),
tls: url.protocol === "https:" ? "On" : "Off",
};
const vectorContent = ref(null);
return {
store,
config,
endpoint,
vectorContent,
};
},
web/src/layouts/MainLayout.vue
+2 -2
View File
@@ -38,14 +38,14 @@
<q-toolbar-title></q-toolbar-title>
<q-btn
class="q-ml-xs text-bold no-border"
class="q-ml-xs no-border"
size="13px"
no-caps
:label="t(`menu.openapi`)"
@click="navigateToOpenAPI(zoBackendUrl)"
/>
<q-btn
class="q-ml-xs text-bold no-border"
class="q-ml-xs no-border"
size="13px"
no-caps
:label="t(`menu.docs`)"
web/src/locales/languages/zh.json
+1 -1
View File
@@ -277,7 +277,7 @@
"rtAlert": "实时警报",
"noData": "没有数据",
"findIngestion": "了解如何采集日志 >>",
"ingestionMsg": "看来你没有向选定的组织发生任何数据，有多种方式可以采集数据，比如 fluentbit。",
"ingestionMsg": "看来你没有向选定的组织发送任何数据，有多种方式可以采集数据，比如 fluentbit。",
"inestedInSearch": "尝试搜索日志",
"searchInDemoOrg": "你可以通过切换到演示组织来探索搜索功能，要切换到演示组织，请使用顶部的组织下拉列表选择 “演示组织”。我们一直在向演示组织发生演示数据。"
}
web/src/plugins/logs/Index.vue
+2 -2
View File
@@ -409,7 +409,7 @@ export default defineComponent({
}
}
function buildZincENLSearch() {
function buildSearch() {
try {
let query = searchObj.data.editorValue;
@@ -609,7 +609,7 @@ export default defineComponent({
}
dismiss = Notify();
const queryReq = buildZincENLSearch();
const queryReq = buildSearch();
searchService
.search({
web/src/services/organizations.ts
+9 -9
View File
@@ -44,37 +44,37 @@ const organizations = {
return http().post("/api/organizations", data);
},
add_members: (data: any, orgIdentifier: string) => {
return http().post(`api/organizations/${orgIdentifier}/members`, data);
return http().post(`/api/organizations/${orgIdentifier}/members`, data);
},
process_subscription: (s: string) => {
return http().get(`api/organizations/member_subscription/${s}`);
return http().get(`/api/organizations/member_subscription/${s}`);
},
get_associated_members: (orgIdentifier: string) => {
return http().get(`api/organizations/associated_members/${orgIdentifier}`);
return http().get(`/api/organizations/associated_members/${orgIdentifier}`);
},
update_member_role: (data: any, orgIdentifier: string) => {
if (config.isZincObserveCloud === "true") {
return http().put(`api/organizations/${orgIdentifier}/member`, data);
return http().put(`/api/organizations/${orgIdentifier}/member`, data);
} else {
return http().patch(`api/${orgIdentifier}/users/${encodeURIComponent(data.email)}`, { role: data.role });
return http().patch(`/api/${orgIdentifier}/users/${encodeURIComponent(data.email)}`, { role: data.role });
}
},
verify_identifier: (name: string) => {
return http().get(`api/organizations/verify_identifier/${name}`);
return http().get(`/api/organizations/verify_identifier/${name}`);
},
get_organization_passcode: (orgIdentifier: string) => {
if (config.isZincObserveCloud === "true") {
return http().get(`/api/organizations/passcode/${orgIdentifier}`);
}
else {
return http().get(`api/${orgIdentifier}/organizations/passcode`);
return http().get(`/api/${orgIdentifier}/organizations/passcode`);
}
},
update_organization_passcode: (orgIdentifier: string) => {
if (config.isZincObserveCloud === "true") {
return http().put(`api/organizations/passcode/${orgIdentifier}`, {});
return http().put(`/api/organizations/passcode/${orgIdentifier}`, {});
} else {
return http().put(`api/${orgIdentifier}/organizations/passcode`, {});
return http().put(`/api/${orgIdentifier}/organizations/passcode`, {});
}
},
get_organization_summary: (orgIdentifier: string) => {
web/src/stores/index.ts
+1 -1
View File
@@ -17,7 +17,7 @@ import { useLocalOrganization, useLocalCurrentUser } from "../utils/zincutils";
export default createStore({
state: {
API_ENDPOINT: import.meta.env.VITE_ZINCOBSERVE_ENDPOINT,
API_ENDPOINT: import.meta.env.VITE_ZINCOBSERVE_ENDPOINT || (window.location.origin != "http://localhost:8081" ? window.location.origin : "http://localhost:5080"),
userInfo: {},
loggedIn: false,
loadingState: true,
web/vite.config.ts
+3 -3
View File
@@ -39,9 +39,9 @@ export default defineConfig({
// testNamePattern: "DateTime",
// ...
},
// server: {
// port: 8081,
// },
server: {
port: 8081,
},
base: "/",
plugins: [
vue({